[Emacs-diffs] /srv/bzr/emacs/trunk r102615: shr.el (shr-image-displayer): Work for images lined side by side.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102615
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-09 06:40:56 +0000
message:
  shr.el (shr-image-displayer): Work for images lined side by side.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-12-08 22:16:36 +0000
+++ b/lisp/gnus/ChangeLog       2010-12-09 06:40:56 +0000
@@ -1,3 +1,7 @@
+2010-12-09  Katsumi Yamaoka  <address@hidden>
+
+       * shr.el (shr-image-displayer): Work for images lined side by side.
+
 2010-12-08  Robert Pluim  <address@hidden>
 
        * gnus-demon.el (gnus-demon-init): Call run-with-timer with an integer

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-12-07 22:12:50 +0000
+++ b/lisp/gnus/shr.el  2010-12-09 06:40:56 +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)))))