summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-04-12 14:16:41 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-04-12 14:16:41 +0000
commitbf0ed58aa450f3dc0b9701b066b46cdbfdd0513a (patch)
treea7a4f39a239fb7e5d3bf28802e9ba208836fa268
parent099c39a447af30fb0e1b1f15adc57934228eb972 (diff)
downloademacs-bf0ed58aa450f3dc0b9701b066b46cdbfdd0513a.tar.gz
mm-url.el (mm-url-package-name): Removed to ease third-party reuse.
(mm-url-insert-file-contents): Don't set the package names.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/mm-url.el11
2 files changed, 5 insertions, 11 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d84c40305a3..fc45e85bbe8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 498d0612519..2ce3791ef3d 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -83,13 +83,6 @@ Likely values are `wget', `w3m', `lynx' and `curl'."
;;; 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