emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Ediff: Use normal state

This commit is contained in:
Justin Burkett 2018-06-10 16:55:41 -04:00 committed by Pierre Neidhardt
parent 41b2c42986
commit 0599d6f7cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evil-collection-ediff.el
View File

@ -166,7 +166,7 @@
(defun evil-collection-ediff-startup-hook ()
"Place evil-ediff bindings in `ediff-mode-map'."
(evil-make-overriding-map ediff-mode-map 'motion)
(evil-make-overriding-map ediff-mode-map 'normal)
(dolist (entry evil-collection-ediff-bindings)
(define-key ediff-mode-map (car entry) (cdr entry)))
(unless (or ediff-3way-comparison-job
@ -179,7 +179,7 @@
(defun evil-collection-ediff-setup ()
"Initialize evil-ediff."
(interactive)
(evil-set-initial-state 'ediff-mode 'motion)
(evil-set-initial-state 'ediff-mode 'normal)
(add-hook 'ediff-startup-hook 'evil-collection-ediff-startup-hook)
(eval-after-load
'(evil-collection-ediff-adjust-help)))