(gnus-summary-exit): Kill the correct article buffer on exit from a `C-d' group.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd6a344..91ee1a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,11 @@
 2011-02-14  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-propagate-marks): Default to nil.
+       (gnus-summary-exit): Kill the correct article buffer on exit from a
+       `C-d' group.
 
        * gnus-start.el (gnus-use-backend-marks): Removed, since it duplicates
-       (gnus-summary-exit): Ditto.gnus-propagate-marks.
+       gnus-propagate-marks.
 
        * gnus-sum.el (gnus-summary-exit-no-update): Restore the group conf
        before killing the buffers so that a non-full window conf gets handled

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index af1cd66..4dfc79a 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7170,6 +7170,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
   (let* ((group gnus-newsgroup-name)
         (quit-config (gnus-group-quit-config gnus-newsgroup-name))
         (gnus-group-is-exiting-p t)
+        (article-buffer gnus-article-buffer)
         (mode major-mode)
         (group-point nil)
         (buf (current-buffer)))
@@ -7236,11 +7237,11 @@ If FORCE (the prefix), also save the .newsrc file(s)."
 
       ;; If we have several article buffers, we kill them at exit.
       (unless gnus-single-article-buffer
-       (when (gnus-buffer-live-p gnus-article-buffer)
-         (with-current-buffer gnus-article-buffer
+       (when (gnus-buffer-live-p article-buffer)
+         (with-current-buffer article-buffer
            ;; Don't kill sticky article buffers
            (unless (eq major-mode 'gnus-sticky-article-mode)
-             (gnus-kill-buffer gnus-article-buffer)
+             (gnus-kill-buffer article-buffer)
              (setq gnus-article-current nil))))
        (gnus-kill-buffer gnus-original-article-buffer))