From f0465f22cce503770e1004c69b902b7db86bfcf6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 7 Oct 2018 11:12:51 -0400 Subject: [PATCH] tools/magit: fix +magit/quit & default display fn When used with magit-display-buffer-traditional, q wouldn't close the window, just kill the buffer inside. --- modules/tools/magit/autoload.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el index fd19a45e6..0c61fa12e 100644 --- a/modules/tools/magit/autoload.el +++ b/modules/tools/magit/autoload.el @@ -53,9 +53,13 @@ "Clean up magit buffers after quitting `magit-status' and refresh version control in buffers." (interactive) - (if (cdr (delq nil (mapcar (lambda (win) (with-selected-window win (eq major-mode 'magit-status-mode))) - (window-list)))) - (quit-window) + (quit-window) + (unless (cdr + (delq nil + (mapcar (lambda (win) + (with-selected-window win + (eq major-mode 'magit-status-mode))) + (window-list)))) (mapc #'+magit--kill-buffer (magit-mode-get-buffers)) (dolist (buffer (buffer-list)) (with-current-buffer buffer