From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 10 Feb 2015 07:52:57 +0000 (+0000)
Subject: mm-decode.el: Fix previous commit
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=37645a283b23df8169ab52431b0f0baa24a79533;ds=sidebyside

mm-decode.el: Fix previous commit
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30c818079..9d01fa500 100644
--- a/lisp/ChangeLog
+++ b/lisp/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/mm-decode.el b/lisp/mm-decode.el
index 6c783bbef..b2a0cadb8 100644
--- a/lisp/mm-decode.el
+++ b/lisp/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)