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

vcs: add git-messenger and magit plugins

Browse source
This commit is contained in:
Henrik Lissner 2016-05-23 16:52:52 -04:00
parent 81854c2a9f
commit 10d309571b
2 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/core-popup.el
View file

@ -26,10 +26,13 @@
("*esup*" :align below :size 30 :noselect t)
("*ert*" :align below :size 20 :noselect t)
;; vcs
("^\\*git-gutter.+\\*$" :align below :size 0.4 :noselect t :regexp t)
("*vc-diff*" :align below :size 0.4 :noselect t)
("*vc-change-log*" :align below :select t)
("*git-messenger*" :align left :size 55 :select t)
("^\\*git-gutter.+\\*$" :align below :size 15 :noselect t :regexp t)
("*vc-diff*" :align below :size 15 :noselect t)
("*vc-change-log*" :align below :size 15 :select t)
(vc-annotate-mode :same t)
((:custom (lambda (b &rest _) (derived-mode-p 'magit-mode)))
:align below :size 0.5)
;; Util
("*Apropos*" :align below :size 0.3)
("*minor-modes*" :align below :size 0.5 :noselect t)
@ -94,6 +97,21 @@
;; Hacks
;;
(defun doom-load-magit-hacks ()
;; Some wrassling must be done to get magit to kill itself, and trigger my
;; shackle popup hooks.
(setq magit-bury-buffer-function
(lambda (&rest _) (doom/popup-close (selected-window)))
magit-display-buffer-function
(lambda (b)
(funcall (if (doom/popup-p (selected-window)) 'switch-to-buffer 'doom/popup-buffer) b)
(get-buffer-window b))
magit-display-file-buffer-function
(lambda (b)
(when doom-prev-buffer
(select-window (get-buffer-window doom-prev-buffer)))
(switch-to-buffer b))))
(after! help-mode
;; So that help buffer links do not open in the help popup, we need to redefine these
;; three button types to use `switch-to-buffer' rather than `pop-to-buffer'.