ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2026-02-04 06:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

avy.el: Use avy-process instead of avy--process

Browse Source 
Re #266
This commit is contained in:
Oleh Krehel
2019-03-19 19:13:51 +01:00
parent 8db2759adf
commit 7d73ceeb74
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
avy.el
View File

@@ -841,7 +841,7 @@ multiple OVERLAY-FN invocations."
(message "zero candidates")
t)
((eq res 'restart)
(avy--process original-cands overlay-fn cleanup-fn))
(avy-process original-cands overlay-fn cleanup-fn))
;; ignore exit from `avy-handler-function'
((eq res 'exit))
(t
@@ -1217,7 +1217,7 @@ ACTION is a function that takes point position as an argument."
(if window-flip
(not avy-all-windows)
avy-all-windows)))
(avy--process
(avy-process
(avy--regex-candidates regex beg end))))
(defun avy--generic-jump (regex window-flip &optional beg end)
@@ -1230,7 +1230,7 @@ BEG and END narrow the scope where candidates are searched."
(if window-flip
(not avy-all-windows)
avy-all-windows)))
(avy--process
(avy-process
(avy--regex-candidates regex beg end))))
;;* Commands
@@ -1314,7 +1314,7 @@ When ARG is non-nil, do the opposite of `avy-all-windows'."
(defun avy-isearch ()
"Jump to one of the current isearch candidates."
(interactive)
(avy-with avy-isearch
(avy-with avy-isearch
(let ((avy-background nil))
(avy-process
(avy--regex-candidates (if isearch-regexp
@@ -1480,7 +1480,7 @@ BEG and END narrow the scope where candidates are searched."
(or (null predicate)
(and predicate (funcall predicate)))
(not (get-char-property (point) 'invisible))
(push (cons (point) (selected-window)) window-cands)))
(push (cons (point) (selected-window)) window-cands)))
(setq candidates (nconc candidates window-cands))))))
(avy-process candidates))))
@@ -1639,7 +1639,7 @@ When BOTTOM-UP is non-nil, display avy candidates from top to bottom"
(avy-style (if avy-linum-mode
(progn
(message "Goto line:")
'ignore)
'ignore)
avy-style)))
(avy-process
(avy--line-cands arg beg end bottom-up))))
@@ -2048,7 +2048,7 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P")
(let ((avy-all-windows (if arg
(not avy-all-windows)
avy-all-windows)))
avy-all-windows)))
(avy-with avy-goto-char-timer
(avy-process
(avy--read-candidates)))))
@@ -2113,7 +2113,7 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P")
(let ((avy-all-windows (if arg
(not avy-all-windows)
avy-all-windows)))
avy-all-windows)))
(avy-with avy-goto-char-timer
(avy-process
(avy--read-candidates