Skip to content

Fix: evilem motion forward word end stopping at single letters #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: evilem motion forward word end stopping at single letters #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea25cd
fix: make {word,WORD}-end movements see past single letters in operat…
kassick Jan 19, 2022
3309d37
fix: call evilem--compute-inclusivity with the name of the function
kassick Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions evil-easymotion.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@
;; make sure the motion doesn't move the window
(scroll-conservatively 101)
(smooth-scrolling-mode nil)
(scroll-margin 0))
(scroll-margin 0)
(evil-state 'normal))
(if (functionp func)
(avy-dowindows current-prefix-arg
(save-excursion
Expand Down Expand Up @@ -184,10 +185,12 @@

(eval-and-compile
(defun evilem--compute-inclusivity (funcs)
(when (and (= (length funcs) 1)
(evil-has-command-properties-p (car funcs)))
`(setq evil-this-type
',(evil-get-command-property (car funcs) :type)))))
(cond ((symbolp funcs) `(setq evil-this-type
',(evil-get-command-property funcs :type)))

((and (listp funcs) (= (length funcs) 1)) (evilem--compute-inclusivity (car funcs)))

((and (listp funcs) (= (length funcs) 2) (eq (car funcs) 'function)) (evilem--compute-inclusivity (cdr funcs))))))

(cl-defmacro evilem-make-motion (name
funcs
Expand Down