diff options
Diffstat (limited to 'lisp/gnus/gnus-art.el')
| -rw-r--r-- | lisp/gnus/gnus-art.el | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0cd34e445cc..d826faca5bd 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4799,11 +4799,10 @@ If a prefix ARG is given, ask for confirmation." (interactive "P") (dolist (buf (gnus-buffers)) (with-current-buffer buf - (when (derived-mode-p 'gnus-sticky-article-mode) - (if (not arg) - (gnus-kill-buffer buf) - (when (yes-or-no-p (concat "Kill buffer " (buffer-name buf) "? ")) - (gnus-kill-buffer buf))))))) + (and (derived-mode-p 'gnus-sticky-article-mode) + (or (not arg) + (yes-or-no-p (format "Kill buffer %s? " buf))) + (gnus-kill-buffer buf))))) ;;; ;;; Gnus MIME viewing functions @@ -6979,9 +6978,7 @@ If given a prefix, show the hidden text instead." ;; doesn't belong in this newsgroup (possibly), so we find its ;; message-id and request it by id instead of number. (when (and (numberp article) - gnus-summary-buffer - (get-buffer gnus-summary-buffer) - (gnus-buffer-exists-p gnus-summary-buffer)) + (gnus-buffer-live-p gnus-summary-buffer)) (with-current-buffer gnus-summary-buffer (let ((header (gnus-summary-article-header article))) (when (< article 0) @@ -7015,11 +7012,9 @@ If given a prefix, show the hidden text instead." (cond ;; Refuse to select canceled articles. ((and (numberp article) - gnus-summary-buffer - (get-buffer gnus-summary-buffer) - (gnus-buffer-exists-p gnus-summary-buffer) - (eq (cdr (with-current-buffer gnus-summary-buffer - (assq article gnus-newsgroup-reads))) + (gnus-buffer-live-p gnus-summary-buffer) + (eq (with-current-buffer gnus-summary-buffer + (cdr (assq article gnus-newsgroup-reads))) gnus-canceled-mark)) nil) ;; We first check `gnus-original-article-buffer'. |