awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-23 14:03:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add EMACS26+ & EMACS27+ constants

Browse Source
This commit is contained in:
Henrik Lissner
2018-03-24 04:40:24 -04:00
parent b5db4f1fb6
commit 5eadfdc880
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/feature/version-control/config.el
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)