From 8aa205d9bac6008fd7adbc35f5f1ef7594a0b551 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 30 Jan 2014 16:02:15 -0800 Subject: [PATCH] Fix stale summary buffer name when using a single article buffer * gnus-art.el (gnus-article-setup-buffer): Refresh the summary buffer name if we're using a single article buffer. Otherwise, it may point to a killed buffer (bug#13756). --- lisp/ChangeLog | 6 ++++++ lisp/gnus-art.el | 30 ++++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 366b71ca7..0d20dba37 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-01-31 Lars Ingebrigtsen + + * gnus-art.el (gnus-article-setup-buffer): Refresh the summary buffer + name if we're using a single article buffer. Otherwise, it may point + to a killed buffer (bug#13756). + 2014-01-30 Lars Ingebrigtsen * nnmail.el (nnmail-split-it): Instead of redoing the search to restore diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index dc3fc0777..6f3265592 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -4550,20 +4550,22 @@ commands: nil) (error "Action aborted")) t))) - (with-current-buffer name - (set (make-local-variable 'gnus-article-edit-mode) nil) - (gnus-article-stop-animations) - (when gnus-article-mime-handles - (mm-destroy-parts gnus-article-mime-handles) - (setq gnus-article-mime-handles nil)) - ;; Set it to nil in article-buffer! - (setq gnus-article-mime-handle-alist nil) - (buffer-disable-undo) - (setq buffer-read-only t) - (unless (derived-mode-p 'gnus-article-mode) - (gnus-article-mode)) - (setq truncate-lines gnus-article-truncate-lines) - (current-buffer)) + (let ((summary gnus-summary-buffer)) + (with-current-buffer name + (set (make-local-variable 'gnus-article-edit-mode) nil) + (gnus-article-stop-animations) + (when gnus-article-mime-handles + (mm-destroy-parts gnus-article-mime-handles) + (setq gnus-article-mime-handles nil)) + ;; Set it to nil in article-buffer! + (setq gnus-article-mime-handle-alist nil) + (buffer-disable-undo) + (setq buffer-read-only t) + (unless (derived-mode-p 'gnus-article-mode) + (gnus-article-mode)) + (set (make-local-variable 'gnus-summary-buffer) summary) + (setq truncate-lines gnus-article-truncate-lines) + (current-buffer))) (let ((summary gnus-summary-buffer)) (with-current-buffer (gnus-get-buffer-create name) (gnus-article-mode) -- 2.34.1