From 1de396ae8d97c4f74b53bf2ce38265f940b6fec8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 10 Dec 2017 15:12:17 -0500 Subject: [PATCH] feature/version-control: appease byte-compiler in Emacs 26 --- modules/feature/version-control/config.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/feature/version-control/config.el b/modules/feature/version-control/config.el index f5e7e0a1b..f13540e2e 100644 --- a/modules/feature/version-control/config.el +++ b/modules/feature/version-control/config.el @@ -23,11 +23,12 @@ :hook (find-file . +vcs|enable-smerge-mode-maybe) :config (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)) + (with-no-warnings + (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))) (def-hydra! +hydra-smerge (:hint nil :pre (smerge-mode 1)