changeset 111857:b8a431283d07

shr.el (shr-image-displayer): Work for images lined side by side.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 09 Dec 2010 06:40:56 +0000
parents 833dc58a519e
children 56410560bc86
files lisp/gnus/ChangeLog lisp/gnus/shr.el
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Wed Dec 08 21:55:25 2010 -0800
+++ b/lisp/gnus/ChangeLog	Thu Dec 09 06:40:56 2010 +0000
@@ -1,3 +1,7 @@
+2010-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* shr.el (shr-image-displayer): Work for images lined side by side.
+
 2010-12-08  Robert Pluim  <rpluim@gmail.com>
 
 	* gnus-demon.el (gnus-demon-init): Call run-with-timer with an integer
--- a/lisp/gnus/shr.el	Wed Dec 08 21:55:25 2010 -0800
+++ b/lisp/gnus/shr.el	Thu Dec 09 06:40:56 2010 +0000
@@ -524,7 +524,7 @@
   "Return a function to display an image.
 CONTENT-FUNCTION is a function to retrieve an image for a cid url that
 is an argument.  The function to be returned takes three arguments URL,
-START, and END."
+START, and END.  Note that START and END should be merkers."
   `(lambda (url start end)
      (when url
        (if (string-match "\\`cid:" url)
@@ -534,9 +534,8 @@
 		 (when image
 		   (goto-char start)
 		   (shr-put-image image
-				  (prog1
-				      (buffer-substring-no-properties start end)
-				    (delete-region start end))))))
+				  (buffer-substring-no-properties start end))
+		   (delete-region (point) end))))
 	 (url-retrieve url 'shr-image-fetched
 		       (list (current-buffer) start end)
 		       t)))))