Fix subword commands with custom order.

This commit is contained in:
Daniel H. Leidisch 2019-10-25 00:51:29 +02:00
parent 87394c9a88
commit f9c15c573c

6
avy.el
View File

@ -1540,13 +1540,15 @@ BEG and END narrow the scope where candidates are searched."
(when (or (null predicate)
(and predicate (funcall predicate)))
(unless (not (avy--visible-p (point)))
(push (cons (point) (selected-window)) window-cands)))
(push (cons (cons (point) (1+ (point)))
(selected-window)) window-cands)))
(subword-backward))
(and (= (point) ws)
(or (null predicate)
(and predicate (funcall predicate)))
(not (get-char-property (point) 'invisible))
(push (cons (point) (selected-window)) window-cands)))
(push (cons (cons (point) (1+ (point)))
(selected-window)) window-cands)))
(setq candidates (nconc candidates window-cands))))))
(avy-process candidates))))