TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: fix evilification of evil-escape starter key 

also remove now obsolete fix thanks to this new fix

Fixes #2167
Fixes #2183
Fixes #2184
This commit is contained in:
syl20bnr 2015-07-02 21:40:32 -04:00
parent 794904adb0
commit 29de3b9d0c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-evilify-keymap.el
View File

@ -21,7 +21,11 @@
(or ,evilified-map evil-evilified-state-map)))
processed)
(mapc (lambda (map-entry)
(unless (member (car map-entry) processed)
(unless (or (member (car map-entry) processed)
;; don't care about evil-escape starter key
(and (boundp 'evil-escape-key-sequence)
(equal (car map-entry)
(elt evil-escape-key-sequence 0))))
(setq processed (spacemacs//evilify-event
,map ',map
(car map-entry) (cdr map-entry)))))
@ -138,8 +142,7 @@
,(spacemacs//evilify-wrapper-documentation
map-value event evil-value evil-event)
(interactive)
(if (and (eq 'evilified evil-state)
(null evil-escape-inhibit))
(if (eq 'evilified evil-state)
;; evilified state
,(if evil-value
(spacemacs//evilify-call evil-value event)