emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove def-hydra! macro alias

Browse source 
Causes byte-compilation issues and the alias is unnecessary.
This commit is contained in:
Henrik Lissner 2018-05-24 22:03:17 +02:00
parent 7c611df6a6
commit 0b48575c14
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
7 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/feature/version-control/config.el
View file

@ -28,11 +28,11 @@
(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)
;; Disable `smerge-mode' when quitting hydra if
;; no merge conflicts remain.
:post (smerge-auto-leave))
(defhydra +hydra-smerge (:hint nil
:pre (smerge-mode 1)
;; Disable `smerge-mode' when quitting hydra if
;; no merge conflicts remain.
:post (smerge-auto-leave))
"
╭────────┐
Movement Keep Diff Other │ smerge │