[elpa] externals/vundo a66bb05062 35/58: Merge branch 'pr-evil-mode-disable'

[ELPA Syncer]

branch: externals/vundo
commit a66bb05062a0f48ecea1778493a2e75cc78323ba
Merge: 1b98c3708c aefb233005
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>

    Merge branch 'pr-evil-mode-disable'
---
 vundo.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vundo.el b/vundo.el
index eec59cc3c6..c50780dc4e 100644
--- a/vundo.el
+++ b/vundo.el
@@ -542,7 +542,12 @@ WINDOW is the window that was/is displaying the vundo 
buffer."
         truncate-lines t
         cursor-type nil)
   (jit-lock-mode -1)
-  (face-remap-add-relative 'default 'vundo-default))
+  (face-remap-add-relative 'default 'vundo-default)
+
+  ;; Disable evil-mode, as normal-mode
+  ;; key bindings override the ones set by vundo.
+  (when (boundp 'evil-emacs-state-modes)
+    (push 'vundo-mode evil-emacs-state-modes)))
 
 (defvar-local vundo--prev-mod-list nil
   "Modification list generated by ‘vundo--mod-list-from’.")