Add EMACS26+ & EMACS27+ constants
This commit is contained in:
parent
b5db4f1fb6
commit
5eadfdc880
4 changed files with 7 additions and 4 deletions
|
@ -20,7 +20,7 @@
|
|||
(def-package! smerge-mode
|
||||
:hook (find-file . +vcs|enable-smerge-mode-maybe)
|
||||
:config
|
||||
(when (version< emacs-version "26")
|
||||
(unless EMACS26+
|
||||
(with-no-warnings
|
||||
(defalias #'smerge-keep-upper #'smerge-keep-mine)
|
||||
(defalias #'smerge-keep-lower #'smerge-keep-other)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue