Merge pull request #2634 from sebastiansturm/develop

Extend backend-agnostic vc functionality
This commit is contained in:
Henrik Lissner 2020-03-01 01:29:00 -05:00 committed by GitHub
commit 594c047517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 8 deletions

View file

@ -3,18 +3,31 @@
(when IS-WINDOWS
(setenv "GIT_ASKPASS" "git-gui--askpass"))
(after! log-view
(set-evil-initial-state!
'(log-view-mode
vc-git-log-view-mode
vc-hg-log-view-mode
vc-bzr-log-view-mode
vc-svn-log-view-mode)
'emacs)
(evil-define-key* '(emacs) log-view-mode-map (kbd doom-leader-key) 'doom/leader)
(map! :mode log-view-mode
"j" #'log-view-msg-next
"k" #'log-view-msg-prev))
(after! vc-annotate
(set-popup-rules!
'(("^\\vc-d" :select nil) ; *vc-diff*
("^\\vc-c" :select t))) ; *vc-change-log*
'(("^\\*vc-diff" :select nil) ; *vc-diff*
("^\\*vc-change" :select t))) ; *vc-change-log*
(set-evil-initial-state!
'(vc-annotate-mode vc-git-log-view-mode)
'(vc-annotate-mode)
'normal)
;; Clean up after itself
(define-key vc-annotate-mode-map [remap quit-window] #'kill-current-buffer))
(after! vc-dir (set-evil-initial-state! '(vc-dir-mode) 'emacs))
(after! git-timemachine
;; Sometimes I forget `git-timemachine' is enabled in a buffer, so instead of