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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113449
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2013-07-18 11:26:04 +0000
message:
  gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's that the 
old Emacs 24s bundle
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-art.el          gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-07-14 05:18:48 +0000
+++ b/lisp/gnus/ChangeLog       2013-07-18 11:26:04 +0000
@@ -1,3 +1,8 @@
+2013-07-18  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-start.el (gnus-clean-old-newsrc): Always remove 'unexist' marks

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2013-07-06 23:40:56 +0000
+++ b/lisp/gnus/gnus-art.el     2013-07-18 11:26:04 +0000
@@ -6197,9 +6197,14 @@
 
 (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))))