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

General refactor & cleanup

Browse source
This commit is contained in:
Henrik Lissner 2017-09-15 14:35:18 +02:00
parent 9f6b90cf13
commit 91783e0695
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
7 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,14 +27,12 @@
(add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
:config
(when (featurep! :feature hydra)
(require 'hydra)
(when (version< emacs-version "26")
(defalias 'smerge-keep-upper 'smerge-keep-mine)
(defalias 'smerge-keep-lower 'smerge-keep-other)
(defalias 'smerge-diff-base-upper 'smerge-diff-base-mine)
(defalias 'smerge-diff-upper-lower 'smerge-diff-mine-other)
(defalias 'smerge-diff-base-lower 'smerge-diff-base-other))
(defalias #'smerge-keep-upper #'smerge-keep-mine)
(defalias #'smerge-keep-lower #'smerge-keep-other)
(defalias #'smerge-diff-base-upper #'smerge-diff-base-mine)
(defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other))
(defhydra +hydra-smerge (:hint nil
:pre (smerge-mode 1)