ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-13 05:23:05 +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
Show Stats 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") (message "zero candidates")
t) t)
((eq res 'restart) ((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' ;; ignore exit from `avy-handler-function'
((eq res 'exit)) ((eq res 'exit))
(t (t
@ -1217,7 +1217,7 @@ ACTION is a function that takes point position as an argument."
(if window-flip (if window-flip
(not avy-all-windows) (not avy-all-windows)
avy-all-windows))) avy-all-windows)))
(avy--process (avy-process
(avy--regex-candidates regex beg end)))) (avy--regex-candidates regex beg end))))
(defun avy--generic-jump (regex window-flip &optional 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 (if window-flip
(not avy-all-windows) (not avy-all-windows)
avy-all-windows))) avy-all-windows)))
(avy--process (avy-process
(avy--regex-candidates regex beg end)))) (avy--regex-candidates regex beg end))))
;;* Commands ;;* Commands
@ -1314,7 +1314,7 @@ When ARG is non-nil, do the opposite of `avy-all-windows'."
(interactive) (interactive)
(avy-with avy-isearch (avy-with avy-isearch
(let ((avy-background nil)) (let ((avy-background nil))
(avy--process (avy-process
(avy--regex-candidates (if isearch-regexp (avy--regex-candidates (if isearch-regexp
isearch-string isearch-string
(regexp-quote isearch-string)))) (regexp-quote isearch-string))))
@ -1480,7 +1480,7 @@ BEG and END narrow the scope where candidates are searched."
(not (get-char-property (point) 'invisible)) (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)))))) (setq candidates (nconc candidates window-cands))))))
(avy--process candidates)))) (avy-process candidates))))
;;;###autoload ;;;###autoload
(defun avy-goto-subword-1 (char &optional arg) (defun avy-goto-subword-1 (char &optional arg)
@ -1639,7 +1639,7 @@ When BOTTOM-UP is non-nil, display avy candidates from top to bottom"
(message "Goto line:") (message "Goto line:")
'ignore) 'ignore)
avy-style))) avy-style)))
(avy--process (avy-process
(avy--line-cands arg beg end bottom-up)))) (avy--line-cands arg beg end bottom-up))))
;;;###autoload ;;;###autoload
@ -2048,7 +2048,7 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(not avy-all-windows) (not avy-all-windows)
avy-all-windows))) avy-all-windows)))
(avy-with avy-goto-char-timer (avy-with avy-goto-char-timer
(avy--process (avy-process
(avy--read-candidates))))) (avy--read-candidates)))))
(defun avy-push-mark () (defun avy-push-mark ()
@ -2113,7 +2113,7 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(not avy-all-windows) (not avy-all-windows)
avy-all-windows))) avy-all-windows)))
(avy-with avy-goto-char-timer (avy-with avy-goto-char-timer
(avy--process (avy-process
(avy--read-candidates (avy--read-candidates
(lambda (input) (lambda (input)
(format "^\\*+ .*\\(%s\\)" input)))) (format "^\\*+ .*\\(%s\\)" input))))