spacemacs-base: Add evil-ediff

This is a simple package I wrote to add a few vim-like bindings to ediff
and make the help popup reflect these bindings.
This commit is contained in:
justbur 2016-01-17 14:05:27 -05:00 committed by syl20bnr
parent c5166bc155
commit 2f94ada233

View file

@ -19,6 +19,7 @@
ediff
eldoc
evil
evil-ediff
evil-escape
;; evil-leader
evil-surround
@ -145,6 +146,11 @@
ediff-split-window-function 'split-window-horizontally
ediff-merge-split-window-function 'split-window-horizontally))))
(defun spacemacs-base/init-evil-ediff ()
(use-package evil-ediff
:after (ediff)
:if (memq dotspacemacs-editing-style '(hybrid vim))))
(defun spacemacs-base/init-eldoc ()
(use-package eldoc
:defer t