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

hybrid: redefine evil-insert-state-p

Browse source 
If it has nasty side effects we will just revert it in favor of the
precedent commit.
This commit is contained in:
syl20bnr 2015-09-26 00:54:56 -04:00
parent 90fc25a19c
commit 983e569de6
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
layers/+distribution/spacemacs-base/local/hybrid-mode/hybrid-mode.el
View file

@ -58,24 +58,13 @@
(setf (symbol-function 'hybrid-mode--evil-insert-state-backup)
(symbol-function 'evil-insert-state))
(eval-after-load 'evil
'(progn
(defun evil-visual-activate-hook (&optional command)
"Enable Visual state if the region is activated."
(unless (evil-visual-state-p)
(evil-delay nil
;; the activation may only be momentary, so re-check
;; in `post-command-hook' before entering Visual state
'(unless (or (evil-visual-state-p)
(evil-insert-state-p)
(evil-hybrid-state-p)
(evil-emacs-state-p))
(when (and (region-active-p)
(not deactivate-mark))
(evil-visual-state)))
'post-command-hook nil t
"evil-activate-visual-state")))
(put 'evil-visual-activate-hook 'permanent-local-hook t)))
;; Override stock evil function `evil-insert-state-p'
(defun evil-insert-state-p (&optional state)
"Whether the current state is insert.
\(That is, whether `evil-state' is either `evil-insert-state' or
`evil-hybrid-state'.)"
(and evil-local-mode
(memq (or state evil-state) '(insert hybrid))))
;;;###autoload
(define-minor-mode hybrid-mode