awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

feature/version-control: appease byte-compiler in Emacs 26

Browse Source
This commit is contained in:
Henrik Lissner
2017-12-10 15:12:17 -05:00
parent a41f02e6e7
commit 1de396ae8d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/feature/version-control/config.el
View File

@ -23,11 +23,12 @@
:hook (find-file . +vcs|enable-smerge-mode-maybe) :hook (find-file . +vcs|enable-smerge-mode-maybe)
:config :config
(when (version< emacs-version "26") (when (version< emacs-version "26")
(defalias #'smerge-keep-upper #'smerge-keep-mine) (with-no-warnings
(defalias #'smerge-keep-lower #'smerge-keep-other) (defalias #'smerge-keep-upper #'smerge-keep-mine)
(defalias #'smerge-diff-base-upper #'smerge-diff-base-mine) (defalias #'smerge-keep-lower #'smerge-keep-other)
(defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other) (defalias #'smerge-diff-base-upper #'smerge-diff-base-mine)
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other)) (defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other)))
(def-hydra! +hydra-smerge (:hint nil (def-hydra! +hydra-smerge (:hint nil
:pre (smerge-mode 1) :pre (smerge-mode 1)