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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index eade6273e95f202244d29486811a70f715c1a1aa..c68013f6da386ffa7f2e697dee072b78046d5136 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus-art.el b/lisp/gnus/gnus-art.el
index b41ff9c055052aeb1be4b95b77c9da1cbb914954..304ac3da88c241f4785c93ccf03e10b363d7af76 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6197,9 +6197,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))))