emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #5003: rethink +magit/quit

Browse source 
Changes +magit/quit to behave more like canonical
magit-mode-bury-buffer, but after burying/killing the last magit buffer
for the current repo, kill all the other buried ones too.

Also binds Q in magit to kill all magit buffers for the current repo.
This commit is contained in:
Henrik Lissner 2021-05-07 14:10:52 -04:00
parent 61376a2ca0
commit 195ad0fec6
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/tools/magit/autoload.el
View file

@ -130,17 +130,27 @@ modified."
;;;###autoload
(defun +magit/quit (&optional kill-buffer)
"Clean up magit buffers after quitting `magit-status' and refresh version
control in buffers."
"Bury the current magit buffer.
If KILL-BUFFER, kill this buffer instead of burying it.
If the buried/killed magit buffer was the last magit buffer open for this repo,
kill all magit buffers for this repo."
(interactive "P")
(funcall magit-bury-buffer-function kill-buffer)
(unless (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))
(+magit-mark-stale-buffers-h)))
(let ((topdir (magit-toplevel)))
(funcall magit-bury-buffer-function kill-buffer)
(or (cl-find-if (lambda (win)
(with-selected-window win
(and (derived-mode-p 'magit-mode)
(equal magit--default-directory topdir))))
(window-list))
(+magit/quit-all))))
;;;###autoload
(defun +magit/quit-all ()
"Kill all magit buffers for the current repository."
(interactive)
(mapc #'+magit--kill-buffer (magit-mode-get-buffers))
(+magit-mark-stale-buffers-h))
(defun +magit--kill-buffer (buf)
"TODO"