From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 18 Jul 2013 11:21:18 +0000 (+0000)
Subject: gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's that the old... 
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=38b1aab026243fce05b01c8f2894d5563806e246

gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's that the old Emacs 24s bundle
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 163a9d3cb..db10d01a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's
+	that the old Emacs 24s bundle.
+
 2013-07-10  David Engster  <deng@randomsample.de>
 
 	* gnus-start.el (gnus-clean-old-newsrc): Always remove 'unexist' marks
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a8ee48011..181e64aa8 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6198,9 +6198,14 @@ Provided for backwards compatibility."
 
 (defun gnus-shr-put-image (data alt &optional flags)
   "Put image DATA with a string ALT.  Enable image to be deleted."
-  (let ((image (shr-put-image data (propertize (or alt "*")
-					       'gnus-image-category 'shr)
-			      flags)))
+  (let ((image (if flags
+		   (shr-put-image data (propertize (or alt "*")
+						   'gnus-image-category 'shr)
+				  flags)
+		 ;; Old `shr-put-image' doesn't take the optional `flags'
+		 ;; argument.
+		 (shr-put-image data (propertize (or alt "*")
+						 'gnus-image-category 'shr)))))
     (when image
       (gnus-add-image 'shr image))))