From 75366be2c0aa877eb6acf1b8a1c5312d6504caa9 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 28 Apr 2022 18:36:59 +0200 Subject: [PATCH] Kill off more Gnus buffers on Gnus exit * lisp/gnus/gnus.el (gnus-kill-buffer): Make into function; there's no reason this should be a macro. * lisp/gnus/nntp.el (nntp-make-process-buffer): Ensure that we kill these buffers on Gnus exit (bug#55167). --- lisp/gnus/gnus.el | 9 ++++----- lisp/gnus/nntp.el | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 4754a14147f..1f673771fa1 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -662,12 +662,11 @@ be used directly.") (gnus-prune-buffers) (cl-pushnew (current-buffer) gnus-buffers)) -(defmacro gnus-kill-buffer (buffer) +(defun gnus-kill-buffer (buffer) "Kill BUFFER and remove from the list of Gnus buffers." - `(let ((buf ,buffer)) - (when (gnus-buffer-live-p buf) - (kill-buffer buf) - (gnus-prune-buffers)))) + (when (gnus-buffer-live-p buffer) + (kill-buffer buffer) + (gnus-prune-buffers))) (defun gnus-buffers () "Return a list of live Gnus buffers." diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 0dcff9743ad..f047c832931 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1225,6 +1225,7 @@ If SEND-IF-FORCE, only send authinfo to the server if the (generate-new-buffer (format " *server %s %s %s*" nntp-address nntp-port-number buffer)) + (gnus-add-buffer) (mm-disable-multibyte) (setq-local after-change-functions nil nntp-process-wait-for nil -- 2.39.5