From 1374cd615fdbf5b924547f0efe194d90ffcc394c Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sat, 2 Jun 2018 01:56:25 -0400 Subject: [PATCH] Fix evil-escape lighter being shown in mode-line Also simplify code a bit. --- layers/+spacemacs/spacemacs-evil/funcs.el | 13 +++++-------- layers/+spacemacs/spacemacs-evil/packages.el | 10 ++++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/layers/+spacemacs/spacemacs-evil/funcs.el b/layers/+spacemacs/spacemacs-evil/funcs.el index e781951b3..17caa7771 100644 --- a/layers/+spacemacs/spacemacs-evil/funcs.el +++ b/layers/+spacemacs/spacemacs-evil/funcs.el @@ -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 diff --git a/layers/+spacemacs/spacemacs-evil/packages.el b/layers/+spacemacs/spacemacs-evil/packages.el index 97a46e249..1ff12387d 100644 --- a/layers/+spacemacs/spacemacs-evil/packages.el +++ b/layers/+spacemacs/spacemacs-evil/packages.el @@ -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