From ca8221b36682b6c19df4ad33db4b7ec68bbb57fe Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Tue, 14 Sep 2021 16:55:35 -0500
Subject: Correct circe-command-{G,}QUIT behavior

See https://github.com/emacs-circe/circe/issues/402
---
 init.el | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index 3ff6589..855fb28 100644
--- a/init.el
+++ b/init.el
@@ -258,15 +258,28 @@ AKA, DO NOT USE THIS FUNCTION!!!"
 
            circe-command-QUIT :after
            (defun circe-quit@kill-buffer (&rest _)
-             (let ((circe-server-killed-confirmation 'kill-all))
+             ;; `circe-server-killed-confirmation' set to nil, and manually
+             ;; deleting all chat buffers, pending Github issue #402
+             ;; (https://github.com/emacs-circe/circe/issues/402)
+             (let ((circe-server-killed-confirmation nil))
                (with-circe-server-buffer
+                 (dolist (buf (circe-server-chat-buffers))
+                   (let ((circe-channel-killed-confirmation nil))
+                     (kill-buffer buf)))
                  (kill-buffer))))
 
            circe-command-GQUIT :after
            (defun circe-gquit@kill-buffer (&rest _)
-             (let ((circe-server-killed-confirmation 'kill-all))
+             ;; `circe-server-killed-confirmation' set to nil, and manually
+             ;; deleting all chat buffers, pending Github issue #402
+             ;; (https://github.com/emacs-circe/circe/issues/402)
+             (let ((circe-server-killed-confirmation nil))
                (dolist (buf (circe-server-buffers))
                  (with-current-buffer buf
+                   (dolist (buf (circe-server-chat-buffers))
+                     (let ((circe-channel-killed-confirmation nil))
+                       (kill-buffer buf)))
+                   (message "%s: %s" buf circe-server-killed-confirmation)
                    (kill-buffer))))))
 
   (defun circe-command-SHORTEN (url)
-- 
cgit 1.4.1-21-gabe81