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

Major refactor: use-package-always-defer = nil & use :hook

Browse source 
Possibly breaking change: packages are no longer deferred by default.

Addresses #286
This commit is contained in:
Henrik Lissner 2017-12-08 22:33:12 -05:00
parent 2cbd1b9107
commit 9d81bc5a8b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
45 changed files with 90 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/feature/version-control/config.el
View file

@ -20,8 +20,7 @@
(set! :evil-state 'vc-git-log-view-mode 'normal))
(def-package! smerge-mode
:init
(add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
:hook (find-file . +vcs|enable-smerge-mode-maybe)
:config
(when (version< emacs-version "26")
(defalias #'smerge-keep-upper #'smerge-keep-mine)