emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feature/evil: inline inlined function

Browse source
This commit is contained in:
Henrik Lissner 2018-05-11 20:22:58 +02:00
parent 2bbee08105
commit 587d69dda0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/feature/evil/config.el
View file

@ -409,13 +409,9 @@ the new algorithm is confusing, like in python or ruby."
(defvar +evil--mc-compat-evil-prev-state nil) (defvar +evil--mc-compat-evil-prev-state nil)
(defvar +evil--mc-compat-mark-was-active nil) (defvar +evil--mc-compat-mark-was-active nil)
(defsubst +evil--visual-or-normal-p ()
"True if evil mode is enabled, and we are in normal or visual mode."
(and (bound-and-true-p evil-mode)
(not (memq evil-state '(insert emacs)))))
(defun +evil|mc-compat-switch-to-emacs-state () (defun +evil|mc-compat-switch-to-emacs-state ()
(when (+evil--visual-or-normal-p) (when (and (bound-and-true-p evil-mode)
(not (memq evil-state '(insert emacs))))
(setq +evil--mc-compat-evil-prev-state evil-state) (setq +evil--mc-compat-evil-prev-state evil-state)
(when (region-active-p) (when (region-active-p)
(setq +evil--mc-compat-mark-was-active t)) (setq +evil--mc-compat-mark-was-active t))
@ -442,7 +438,8 @@ the new algorithm is confusing, like in python or ruby."
;; When running edit-lines, point will return (position + 1) as a ;; When running edit-lines, point will return (position + 1) as a
;; result of how evil deals with regions ;; result of how evil deals with regions
(defun +evil*mc/edit-lines (&rest _) (defun +evil*mc/edit-lines (&rest _)
(when (+evil--visual-or-normal-p) (when (and (bound-and-true-p evil-mode)
(not (memq evil-state '(insert emacs))))
(if (> (point) (mark)) (if (> (point) (mark))
(goto-char (1- (point))) (goto-char (1- (point)))
(push-mark (1- (mark)))))) (push-mark (1- (mark))))))