avy-jump.el (avy-goto-subword-0): Update candidate order

Re #27
This commit is contained in:
Oleh Krehel 2015-05-09 14:43:52 +02:00
parent cd8e62603f
commit 3716cd0b02

View File

@ -419,17 +419,19 @@ should return true."
(let ((case-fold-search nil) (let ((case-fold-search nil)
candidates) candidates)
(avy-dowindows arg (avy-dowindows arg
(let ((ws (window-start))) (let ((ws (window-start))
window-cands)
(save-excursion (save-excursion
(goto-char (window-end (selected-window) t)) (goto-char (window-end (selected-window) t))
(subword-backward) (subword-backward)
(while (> (point) ws) (while (> (point) ws)
(when (or (null predicate) (when (or (null predicate)
(and predicate (funcall predicate))) (and predicate (funcall predicate)))
(push (cons (point) (selected-window)) candidates)) (push (cons (point) (selected-window)) window-cands))
(subword-backward))))) (subword-backward)))
(setq candidates (nconc candidates window-cands))))
(avy--goto (avy--goto
(avy--process (nreverse candidates) (avy--style-fn avy-style)))))) (avy--process candidates (avy--style-fn avy-style))))))
;;;###autoload ;;;###autoload
(defun avy-goto-subword-1 (&optional arg) (defun avy-goto-subword-1 (&optional arg)