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

tools/magit: clean up after magit more intelligently #506

Browse source 
Ensures magit buffers are cleaned up after magit-status is closed. Will
defer cleanup on process buffers, until the processes have finished.

Also fixes issue where quitting magit will leave leftover windows.
This commit is contained in:
Henrik Lissner 2018-04-08 20:44:35 -04:00
parent ee921f581d
commit 460461ef54
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/lang/org/autoload/org.el
View file

@ -345,3 +345,6 @@ with `org-cycle')."
((org-in-src-block-p)
(org-babel-remove-result)
t)))))
;;;###autoload
(defalias #'+org/toggle-fold #'+org|toggle-only-current-fold)

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

@ -2,9 +2,21 @@
;;;###autoload
(defun +magit/quit (&optional _kill-buffer)
"TODO"
"Clean up magit buffers after quitting `magit-status'."
(interactive)
(magit-restore-window-configuration)
(cl-loop for buf in (doom-buffers-in-mode 'magit-mode (buffer-list) t)
unless (eq (buffer-local-value 'major-mode buf) 'magit-process-mode)
do (kill-buffer buf)))
(let ((buffers (magit-mode-get-buffers)))
(magit-restore-window-configuration)
(mapc #'+magit--kill-buffer buffers)))
(defun +magit--kill-buffer (buf)
"TODO"
(when (and (bufferp buf) (buffer-live-p buf))
(let ((process (get-buffer-process buf)))
(if (not (processp process))
(kill-buffer buf)
(with-current-buffer buf
(if (process-live-p process)
(run-with-timer 5 nil #'+magit--kill buf)
(kill-process process)
(kill-buffer buf)))))))

6
modules/tools/magit/config.el
View file

@ -11,11 +11,11 @@
#'magit-builtin-completing-read)
magit-revision-show-gravatars '("^Author: " . "^Commit: "))
(add-hook 'magit-popup-mode-hook #'hide-mode-line-mode)
(set! :popup "^\\(?:\\*magit\\|magit:\\)" :ignore)
;; no mode-line in magit popups
(add-hook 'magit-popup-mode-hook #'hide-mode-line-mode)
;; Clean up after magit by properly killing buffers
(setq magit-bury-buffer-function #'+magit/quit)
(map! :map magit-mode-map [remap quit-window] #'+magit/quit))
(map! :map magit-status-mode-map [remap magit-mode-bury-buffer] #'+magit/quit))
(def-package! magit-blame