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

emacs/vc: minor reformatting

Browse source 
And fix ;;;###package cookies. They aren't necessary for after! or
use-package! blocks.
This commit is contained in:
Henrik Lissner 2019-08-23 21:27:28 -04:00
parent 8ac1e1a781
commit 3d1569515b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/emacs/vc/config.el
View file

@ -4,10 +4,20 @@
(setenv "GIT_ASKPASS" "git-gui--askpass")) (setenv "GIT_ASKPASS" "git-gui--askpass"))
;;;###package vc
(setq vc-make-backup-files nil (setq vc-make-backup-files nil
vc-follow-symlinks t) vc-follow-symlinks t)
(after! vc-annotate
(set-popup-rules!
'(("^\\vc-d" :select nil) ; *vc-diff*
("^\\vc-c" :select t))) ; *vc-change-log*
(set-evil-initial-state!
'(vc-annotate-mode vc-git-log-view-mode)
'normal))
(after! git-timemachine (after! git-timemachine
;; Sometimes I forget `git-timemachine' is enabled in a buffer, so instead of ;; Sometimes I forget `git-timemachine' is enabled in a buffer, so instead of
;; showing revision details in the minibuffer, show them in ;; showing revision details in the minibuffer, show them in
@ -27,7 +37,6 @@
:n "gtc" #'git-timemachine-show-commit)) :n "gtc" #'git-timemachine-show-commit))
;;;###package git-commit
(use-package! git-commit (use-package! git-commit
:after-call after-find-file :after-call after-find-file
:config :config
@ -48,13 +57,6 @@ otherwise in default state."
(bobp) (eolp)) (bobp) (eolp))
(evil-insert-state))))) (evil-insert-state)))))
(after! vc-annotate
(set-popup-rules!
'(("^\\vc-d" :select nil) ; *vc-diff*
("^\\vc-c" :select t))) ; *vc-change-log*
(set-evil-initial-state!
'(vc-annotate-mode vc-git-log-view-mode)
'normal))
(after! smerge-mode (after! smerge-mode
(unless EMACS26+ (unless EMACS26+