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

Correctly restore evil-lisp-state shadowed function by evil-escape

Browse source
This commit is contained in:
syl20bnr 2015-02-12 00:25:46 -05:00
parent ae162c9e04
commit f0935814a2
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
spacemacs/extensions/evil-escape/evil-escape.el
View file

@ -5,7 +5,7 @@
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; Keywords: convenience editing evil
;; Created: 22 Oct 2014
;; Version: 2.08
;; Version: 2.09
;; Package-Requires: ((emacs "24") (evil "1.0.9"))
;; URL: https://github.com/syl20bnr/evil-escape
@ -91,6 +91,12 @@ This variable is used to restore the original function bound to the
first key of the escape key sequence when `evil-escape'
mode is disabled.")
(defvar evil-escape-lisp-state-shadowed-func nil
"Original function of `evil-lisp-state-map' shadowed by `evil-escape'.
This variable is used to restore the original function bound to the
first key of the escape key sequence when `evil-escape'
mode is disabled.")
;;;###autoload
(define-minor-mode evil-escape-mode
"Buffer-local minor mode to escape insert state and everythin else
@ -232,8 +238,9 @@ with a key sequence."
(define-key isearch-mode-map
(kbd first-key) evil-escape-isearch-shadowed-func))
;; list state
(eval-after-load 'evil-lisp-state
'(define-key evil-lisp-state-map (kbd first-key) nil))
(if evil-escape-lisp-state-shadowed-func
(define-key evil-lisp-state-map
(kbd first-key) evil-escape-lisp-state-shadowed-func))
;; iedit state
(eval-after-load 'evil-iedit-state
'(progn (define-key evil-iedit-state-map (kbd first-key) nil)