From d2bab1dc4dfc05e8c097a4b546336dfa09526115 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 9 Jan 2018 04:05:29 -0500 Subject: [PATCH] Fix kill-this-buffer's dashboard addiction, the sequel Again, the dashboard was being switched to too early (there were still other real buffers to display). --- core/core-ui.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index 163f931c9..5badb3a87 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -531,11 +531,14 @@ instead)." (let ((buf (current-buffer))) (cond ((window-dedicated-p) (delete-window)) - ((or (eq buf (doom-fallback-buffer)) - (doom-real-buffer-p buf)) + ((eq buf (doom-fallback-buffer)) + (bury-buffer) + (when (cdr (get-buffer-window-list)) + (doom--cycle-real-buffers nil))) + ((doom-real-buffer-p buf) (doom--cycle-real-buffers -1) (kill-buffer buf) - (when (cdr (get-buffer-window-list (current-buffer) nil t)) + (when (cdr (get-buffer-window-list)) (doom--cycle-real-buffers nil))) (t (funcall orig-fn)))))