[gnus git] branch no-gnus updated: m0-1-61-g6bfa813 =1= Be more defensive about killing the correct buffer

       via  6bfa8135c0c34c187080add1f7f1e01fae2b4eed (commit)
      from  b1573a5a75b24fd5831e1f556b1a20b2260340ef (commit)


- Log -----------------------------------------------------------------
commit 6bfa8135c0c34c187080add1f7f1e01fae2b4eed
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sat Feb 18 14:09:21 2012 +0100

    Be more defensive about killing the correct buffer
    
    * shr.el (shr-image-fetched): Make sure we really kill the right
    buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e565fe..4e21742 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-18  Lars Ingebrigtsen  <[email protected]>
+
+	* shr.el (shr-image-fetched): Make sure we really kill the right
+	buffer.
+
 2012-02-16  Leo Liu  <[email protected]>
 
 	* gnus-start.el (gnus-1): Avoid duplicate entries.
diff --git a/lisp/shr.el b/lisp/shr.el
index f3d7503..dd0f159 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -524,9 +524,10 @@ the URL of the image to the kill buffer instead."
 				      directory)))))
 
 (defun shr-image-fetched (status buffer start end)
+  (let ((image-buffer (current-buffer)))
   (when (and (buffer-name buffer)
 	     (not (plist-get status :error)))
-    (url-store-in-cache (current-buffer))
+      (url-store-in-cache image-buffer)
     (when (or (search-forward "\n\n" nil t)
 	      (search-forward "\r\n\r\n" nil t))
       (let ((data (buffer-substring (point) (point-max))))
@@ -537,7 +538,7 @@ the URL of the image to the kill buffer instead."
 	      (delete-region start end)
 	      (goto-char start)
 	      (funcall shr-put-image-function data alt)))))))
-  (kill-buffer (current-buffer)))
+    (kill-buffer image-buffer)))
 
 (defun shr-put-image (data alt)
   "Put image DATA with a string ALT.  Return image."

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    5 +++++
 lisp/shr.el    |   29 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, no-gnus has been updated


hooks/post-receive
-- 
Gnus Project