(shr-image-fetched): Avoid having point move in the article buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7a7c18..8abb533 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-23  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * shr.el (shr-image-fetched): Avoid having point move in the article
+       buffer.
+
        * gnus-html.el (gnus-html-image-fetched): Don't kill the temporary
        buffer after being called.  It's apparently being killed by url.el, and
        killing it made point move to end-of-buffer in a random buffer.

diff --git a/lisp/shr.el b/lisp/shr.el
index ed30f5f..badbcaf 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -462,11 +462,12 @@ redirects somewhere else."
              (search-forward "\r\n\r\n" nil t))
       (let ((data (buffer-substring (point) (point-max))))
         (with-current-buffer buffer
-          (let ((alt (buffer-substring start end))
-               (inhibit-read-only t))
-           (delete-region start end)
-           (goto-char start)
-           (shr-put-image data alt)))))))
+         (save-excursion
+           (let ((alt (buffer-substring start end))
+                 (inhibit-read-only t))
+             (delete-region start end)
+             (goto-char start)
+             (shr-put-image data alt))))))))
 
 (defun shr-put-image (data alt)
   (if (display-graphic-p)