diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-31 19:49:51 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-31 19:49:51 -0700 |
| commit | 7e655d386397029b7ce6ac204fc41e5ddc92cf54 (patch) | |
| tree | 75ffb3cd91672a517cfa643d6f45253c62526e41 /lisp/gnus/gnus-sum.el | |
| parent | ccd9a01aa7b67dd3d71b49e3c30df04dd39b4cae (diff) | |
| parent | 357e1c676cba36d5fa7b6819425a38cbad0c30cd (diff) | |
| download | emacs-7e655d386397029b7ce6ac204fc41e5ddc92cf54.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/gnus/gnus-sum.el')
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 2d75c35158a..1c4382b24a6 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7194,7 +7194,11 @@ If FORCE (the prefix), also save the .newsrc file(s)." (article-buffer gnus-article-buffer) (mode major-mode) (group-point nil) - (buf (current-buffer))) + (buf (current-buffer)) + ;; `gnus-single-article-buffer' is nil buffer-locally in + ;; ephemeral group of which summary buffer will be killed, + ;; but the global value may be non-nil. + (single-article-buffer gnus-single-article-buffer)) (unless quit-config ;; Do adaptive scoring, and possibly save score files. (when gnus-newsgroup-adaptive @@ -7257,7 +7261,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (gnus-configure-windows 'group 'force))) ;; If we have several article buffers, we kill them at exit. - (unless gnus-single-article-buffer + (unless single-article-buffer (when (gnus-buffer-live-p article-buffer) (with-current-buffer article-buffer ;; Don't kill sticky article buffers |