[gnus git] branch master updated: n0-17-39-gf31044c =1= gnus-html.el (gnus-html-put-image): Register a displayer. shr.el (shr-image-displayer): Don't remove text props from alt text.

       via  f31044c21918bdf9ccc0366b5896f03b14a3ced6 (commit)
      from  592dfba56d49972352096210e3c7f251e9d9f63b (commit)


- Log -----------------------------------------------------------------
commit f31044c21918bdf9ccc0366b5896f03b14a3ced6
Author: Katsumi Yamaoka <[email protected]>
Date:   Fri May 13 05:34:57 2011 +0000

    gnus-html.el (gnus-html-put-image): Register a displayer.
    shr.el (shr-image-displayer): Don't remove text props from alt text.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60182e1..fe9e083 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-13  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-html.el (gnus-html-put-image): Register a displayer.
+
+	* shr.el (shr-image-displayer): Don't remove text props from alt text.
+
 2011-05-13  Teodor Zlatanov  <[email protected]>
 
 	* registry.el (prune-factor): New initialization parameter defaulting
diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index b7f0c09..a4c4fa5 100644
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -482,8 +482,14 @@ Return a string with image data."
                     (gnus-put-text-property start (point)
 					    'gnus-alt-text alt-text)
                     (when url
-                      (gnus-put-text-property start (point)
-					      'image-url url))
+		      (gnus-add-text-properties
+		       start (point)
+		       `(image-url
+			 ,url
+			 image-displayer
+			 (lambda (url start end)
+			   (gnus-html-display-image ,url ,start ,(point)
+						    ,alt-text)))))
                     (gnus-add-image 'external image)
                     t)
                 ;; Bad image, try to show something else
diff --git a/lisp/shr.el b/lisp/shr.el
index 75c6d5d..edd1066 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -582,7 +582,7 @@ START, and END.  Note that START and END should be merkers."
 		 (when image
 		   (goto-char start)
 		   (funcall shr-put-image-function
-			    image (buffer-substring-no-properties start end))
+			    image (buffer-substring start end))
 		   (delete-region (point) end))))
 	 (url-retrieve url 'shr-image-fetched
 		       (list (current-buffer) start end)

-----------------------------------------------------------------------
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    |    6 ++++++
 lisp/gnus-html.el |   10 ++++++++--
 lisp/shr.el       |    2 +-
 3 files changed, 15 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