From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 23 Jan 2011 23:32:37 +0000 (+0100)
Subject: (shr-image-fetched): Avoid having point move in the article buffer.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=2d97a554d6cc6e17791e6c786fce7710f26895f2

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7a7c187b..8abb53338 100644
--- 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 ed30f5f86..badbcaf3f 100644
--- 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)