summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2015-02-10 07:52:35 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2015-02-10 07:52:35 +0000
commitb88908b6f0775e4275fdad2c80ea0199d277a947 (patch)
treeaf19fdfe78b14b385c0f22b3c5037480a08417df
parentd5111d525f134d0a1f15c61d16d59b20d824f552 (diff)
downloademacs-b88908b6f0775e4275fdad2c80ea0199d277a947.tar.gz
lisp/gnus/mm-decode.el: Fix previous commit
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/mm-decode.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ac7e2acab93..94a55f4bf4e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-10 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * mm-decode.el (mm-convert-shr-links): Delete useless variable `face';
+ use gnus-overlays-at and gnus-overlay-put.
+
2015-02-10 Lars Ingebrigtsen <larsi@gnus.org>
* mm-decode.el (mm-shr): Only pass the fill column when not using
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 6c783bbef03..b2a0cadb804 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -30,6 +30,8 @@
(autoload 'gnus-map-function "gnus-util")
(autoload 'gnus-replace-in-string "gnus-util")
(autoload 'gnus-read-shell-command "gnus-util")
+(autoload 'gnus-overlays-at "gnus-util")
+(autoload 'gnus-overlay-put "gnus-util")
(autoload 'mm-inline-partial "mm-partial")
(autoload 'mm-inline-external-body "mm-extern")
@@ -1894,15 +1896,14 @@ If RECURSIVE, search recursively."
(< start (point-max)))
(when (setq start (text-property-not-all start (point-max) 'shr-url nil))
(setq end (next-single-property-change start 'shr-url nil (point-max)))
- (setq face (get-text-property start 'face))
(widget-convert-button
'url-link start end
:help-echo (get-text-property start 'help-echo)
:keymap shr-map
(get-text-property start 'shr-url))
(put-text-property start end 'local-map nil)
- (dolist (overlay (overlays-at start))
- (overlay-put overlay 'face nil))
+ (dolist (overlay (gnus-overlays-at start))
+ (gnus-overlay-put overlay 'face nil))
(setq start end)))))
(defun mm-handle-filename (handle)