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

Fix evil-escape lighter being shown in mode-line 

Also simplify code a bit.
This commit is contained in:
syl20bnr 2018-06-02 01:56:25 -04:00
parent 8660f93dec
commit 1374cd615f
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layers/+spacemacs/spacemacs-evil/funcs.el
View File

@ -41,14 +41,11 @@ Otherwise, revert to the default behavior (i.e. enable `evil-insert-state')."
(evil-put-property 'evil-state-properties 'iedit-insert
:enable states)))
(defun spacemacs//evil-escape-deactivate-in-holy-mode(style)
"Deactivate `evil-escape' if STYLE is emacs otherwise enable it."
(cond
((or (eq 'vim style)
(eq 'hybrid style))
(evil-escape-mode t))
(t
(evil-escape-mode -1))))
(defun spacemacs//evil-escape-deactivate-in-holy-mode (style)
"Deactivate `evil-escape' if STYLE is `emacs' otherwise enable it."
(if (memq style '(vim hybrid))
(evil-escape-mode t)
(evil-escape-mode -1)))
;; evil-search-highlight-persist

10
layers/+spacemacs/spacemacs-evil/packages.el
View File

@ -96,10 +96,12 @@
(defun spacemacs-evil/init-evil-escape ()
(use-package evil-escape
:init (progn
(spacemacs|hide-lighter evil-escape-mode)
(spacemacs//evil-escape-deactivate-in-holy-mode dotspacemacs-editing-style)
(add-hook 'spacemacs-editing-style-hook #'spacemacs//evil-escape-deactivate-in-holy-mode))))
:init
(progn
(add-hook 'spacemacs-editing-style-hook #'spacemacs//evil-escape-deactivate-in-holy-mode)
;; apply once when emacs starts
(spacemacs//evil-escape-deactivate-in-holy-mode dotspacemacs-editing-style))
:config (spacemacs|hide-lighter evil-escape-mode)))
(defun spacemacs-evil/init-evil-exchange ()
(use-package evil-exchange