From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 9 Dec 2010 06:40:56 +0000 (+0000)
Subject: shr.el (shr-image-displayer): Work for images lined side by side.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2d0ba98bf9953379d075e278fe39439115f21bd;p=emacs.git

shr.el (shr-image-displayer): Work for images lined side by side.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 08c09e3ac64..41a394e46cd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index da9405a0ccf..41c771e38a2 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -524,7 +524,7 @@ Return a string with image data."
   "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 @@ START, and END."
 		 (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)))))