[Emacs-diffs] /srv/bzr/emacs/trunk r103899: mm-url.el (mm-url-package-name): Removed to ease third-party reuse.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103899
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-04-12 14:16:41 +0000
message:
  mm-url.el (mm-url-package-name): Removed to ease third-party reuse.
   (mm-url-insert-file-contents): Don't set the package names.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-url.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-04-11 22:17:30 +0000
+++ b/lisp/gnus/ChangeLog       2011-04-12 14:16:41 +0000
@@ -1,3 +1,8 @@
+2011-04-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mm-url.el (mm-url-package-name): Removed to ease third-party reuse.
+       (mm-url-insert-file-contents): Don't set the package names.
+
 2011-04-11  Teodor Zlatanov  <address@hidden>
 
        * gnus-registry.el (gnus-registry-action): Remove properties and

=== modified file 'lisp/gnus/mm-url.el'
--- a/lisp/gnus/mm-url.el       2011-01-26 08:36:39 +0000
+++ b/lisp/gnus/mm-url.el       2011-04-12 14:16:41 +0000
@@ -83,13 +83,6 @@
 
 ;;; Internal variables
 
-(defvar mm-url-package-name
-  (gnus-replace-in-string
-   (gnus-replace-in-string gnus-version " v.*$" "")
-   " " "-"))
-
-(defvar        mm-url-package-version gnus-version-number)
-
 ;; Stolen from w3.
 (defvar mm-url-html-entities
   '(
@@ -298,10 +291,6 @@
           (if (not (and (boundp 'url-version)
                         (equal url-version "Emacs")))
               (list (cons "Connection" "Close"))))
-         (url-package-name (or mm-url-package-name
-                               url-package-name))
-         (url-package-version (or mm-url-package-version
-                                  url-package-version))
          result)
       (setq result (url-insert-file-contents url))
       (save-excursion