[gnus git] branch master updated: m0-7-174-g38b1aab =1= gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's that the old Emacs 24s bundle

       via  38b1aab026243fce05b01c8f2894d5563806e246 (commit)
      from  8779492ef9d359cf520c405f27569e5ce9fd9842 (commit)


- Log -----------------------------------------------------------------
commit 38b1aab026243fce05b01c8f2894d5563806e246
Author: Katsumi Yamaoka <[email protected]>
Date:   Thu Jul 18 11:21:18 2013 +0000

    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 163a9d3..db10d01 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-18  Katsumi Yamaoka  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* gnus-start.el (gnus-clean-old-newsrc): Always remove 'unexist' marks
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a8ee480..181e64a 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 "*")
+  (let ((image (if flags
+		   (shr-put-image data (propertize (or alt "*")
 					       'gnus-image-category 'shr)
-			      flags)))
+				  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))))
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    5 +++++
 lisp/gnus-art.el |   11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project