(mm-url-package-name): Removed to ease third-party reuse.

(mm-url-insert-file-contents): Don't set the package names.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 153570c..88dec74 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * 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  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-action): Remove properties and

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 498d061..2ce3791 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -83,13 +83,6 @@ Likely values are `wget', `w3m', `lynx' and `curl'."
 \f
 ;;; 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 `mm-url-use-external' is non-nil, use `mm-url-program'."
           (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