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

Fix regression in visual block with evil-escape

Browse source
This commit is contained in:
syl20bnr 2015-01-27 23:10:27 -05:00
parent 55574e009d
commit 14705a27cc
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
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.07
;; Version: 2.08
;; Package-Requires: ((emacs "24") (evil "1.0.9"))
;; URL: https://github.com/syl20bnr/evil-escape
@ -155,13 +155,9 @@ with a key sequence."
(lookup-key evil-motion-state-map (evil-escape--first-key)))
;; evil states
;; insert state
(let ((insert-func (lambda (key) (interactive)
(cond ((eq 'term-mode major-mode)
(call-interactively 'term-send-raw))
(t (evil-escape--default-insert-func key))))))
(eval `(evil-escape-define-escape "insert-state" evil-insert-state-map evil-normal-state
:insert-func ,insert-func
:delete-func evil-escape--default-delete-func)))
(eval `(evil-escape-define-escape "insert-state" evil-insert-state-map evil-normal-state
:insert-func evil-escape--insert-state-insert-func
:delete-func evil-escape--default-delete-func))
;; emacs state
(let ((exit-func (lambda () (interactive)
(cond ((string-match "magit" (symbol-name major-mode))
@ -242,6 +238,13 @@ with a key sequence."
"Insert KEY in current buffer if not read only."
(when (not buffer-read-only) (insert key)))
(defun evil-escape--insert-state-insert-func (key)
"Take care of term-mode."
(interactive)
(cond ((eq 'term-mode major-mode)
(call-interactively 'term-send-raw))
(t (evil-escape--default-insert-func key))))
(defun evil-escape--isearch-insert-func (key)
"Insert KEY in current buffer if not read only."
(isearch-printing-char))