From 24b336322c615dab5d605691240c43204718394d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 14 Oct 2019 18:48:42 -0400 Subject: [PATCH] Fix doom/kill-buried-buffer closing windows By making doom/kill-all-buffers less gung ho about deleting windows when the buffer list is empty. --- core/autoload/buffers.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el index e2a6c853b..1370008ea 100644 --- a/core/autoload/buffers.el +++ b/core/autoload/buffers.el @@ -283,15 +283,16 @@ belong to the current project." (doom-project-buffer-list) (doom-buffer-list)) t)) - (save-some-buffers) - (delete-other-windows) - (when (memq (current-buffer) buffer-list) - (switch-to-buffer (doom-fallback-buffer))) - (mapc #'kill-buffer buffer-list) - (when interactive - (message "Killed %s buffers" - (- (length buffer-list) - (length (cl-remove-if-not #'buffer-live-p buffer-list)))))) + (if (null buffer-list) + (message "No buffers to kill") + (save-some-buffers) + (when (memq (current-buffer) buffer-list) + (switch-to-buffer (doom-fallback-buffer))) + (mapc #'doom-kill-buffer-and-windows buffer-list) + (when interactive + (message "Killed %s buffers" + (- (length buffer-list) + (length (cl-remove-if-not #'buffer-live-p buffer-list))))))) ;;;###autoload (defun doom/kill-other-buffers (&optional buffer-list interactive)