Add EMACS26+ & EMACS27+ constants

This commit is contained in:
Henrik Lissner 2018-03-24 04:40:24 -04:00
parent b5db4f1fb6
commit 5eadfdc880
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 7 additions and 4 deletions

View file

@ -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)