1 files changed, 15 insertions, 2 deletions

@@ -229,9 +229,22 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   (:bind "C-c C-p" #'circe-command-PART)
 
   (:advise circe-command-PART :after
-           (defun circe-command-PART@kill-buffer (&rest _)
+           (defun circe-part@kill-buffer (&rest _)
              (let ((circe-channel-killed-confirmation nil))
-               (kill-buffer))))
+               (kill-buffer)))
+
+           circe-command-QUIT :after
+           (defun circe-quit@kill-buffer (&rest _)
+             (let ((circe-server-killed-confirmation nil))
+               (with-circe-server-buffer
+                 (kill-buffer))))
+
+           circe-command-GQUIT :after
+           (defun circe-gquit@kill-buffer (&rest _)
+             (let ((circe-server-killed-confirmation nil))
+               (dolist (buf (circe-server-buffers))
+                 (with-current-buffer buf
+                   (kill-buffer))))))
 
   (:with-mode circe-chat-mode
     (:hook  #'acdw/stop-paren-annoyances