ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-13 13:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

avy.el (avy-jump): New API, don't use avy--generic-jump

Browse Source 
Fixes #265
This commit is contained in:
Oleh Krehel 2019-02-04 13:01:07 +01:00
parent 91240220ad
commit e80251056d
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
avy.el
View File

@ -1200,11 +1200,26 @@ exist."
(ignore #'ignore) (ignore #'ignore)
(t (error "Unexpected style %S" style)))) (t (error "Unexpected style %S" style))))
(cl-defun avy-jump (regex &key window-flip beg end action)
"Jump to REGEX.
The window scope is determined by `avy-all-windows'.
When WINDOW-FLIP is non-nil, do the opposite of `avy-all-windows'.
BEG and END narrow the scope where candidates are searched.
ACTION is a function that takes point position as an argument."
(setq avy-action (or action avy-action))
(let ((avy-all-windows
(if window-flip
(not avy-all-windows)
avy-all-windows)))
(avy--process
(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)
"Jump to REGEX. "Jump to REGEX.
The window scope is determined by `avy-all-windows'. The window scope is determined by `avy-all-windows'.
When WINDOW-FLIP is non-nil, do the opposite of `avy-all-windows'. When WINDOW-FLIP is non-nil, do the opposite of `avy-all-windows'.
BEG and END narrow the scope where candidates are searched." BEG and END narrow the scope where candidates are searched."
(declare (obsolete avy-jump "0.4.0"))
(let ((avy-all-windows (let ((avy-all-windows
(if window-flip (if window-flip
(not avy-all-windows) (not avy-all-windows)
@ -1220,22 +1235,21 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive (list (read-char "char: " t) (interactive (list (read-char "char: " t)
current-prefix-arg)) current-prefix-arg))
(avy-with avy-goto-char (avy-with avy-goto-char
(avy--generic-jump (avy-jump
(if (= 13 char) (if (= 13 char)
"\n" "\n"
(regexp-quote (string char))) (regexp-quote (string char)))
arg))) :window-flip arg)))
;;;###autoload ;;;###autoload
(defun avy-goto-char-in-line (char) (defun avy-goto-char-in-line (char)
"Jump to the currently visible CHAR in the current line." "Jump to the currently visible CHAR in the current line."
(interactive (list (read-char "char: " t))) (interactive (list (read-char "char: " t)))
(avy-with avy-goto-char (avy-with avy-goto-char
(avy--generic-jump (avy-jump
(regexp-quote (string char)) (regexp-quote (string char))
avy-all-windows :beg (line-beginning-position)
(line-beginning-position) :end (line-end-position))))
(line-end-position))))
;;;###autoload ;;;###autoload
(defun avy-goto-char-2 (char1 char2 &optional arg beg end) (defun avy-goto-char-2 (char1 char2 &optional arg beg end)
@ -1252,10 +1266,11 @@ BEG and END narrow the scope where candidates are searched."
(when (eq char2 ? ) (when (eq char2 ? )
(setq char2 ?\n)) (setq char2 ?\n))
(avy-with avy-goto-char-2 (avy-with avy-goto-char-2
(avy--generic-jump (avy-jump
(regexp-quote (string char1 char2)) (regexp-quote (string char1 char2))
arg :window-flip arg
beg end))) :beg beg
:end end)))
;;;###autoload ;;;###autoload
(defun avy-goto-char-2-above (char1 char2 &optional arg) (defun avy-goto-char-2-above (char1 char2 &optional arg)
@ -1307,7 +1322,10 @@ When ARG is non-nil, do the opposite of `avy-all-windows'.
BEG and END narrow the scope where candidates are searched." BEG and END narrow the scope where candidates are searched."
(interactive "P") (interactive "P")
(avy-with avy-goto-word-0 (avy-with avy-goto-word-0
(avy--generic-jump avy-goto-word-0-regexp arg beg end))) (avy-jump avy-goto-word-0-regexp
:window-flip arg
:beg beg
:end end)))
(defun avy-goto-word-0-above (arg) (defun avy-goto-word-0-above (arg)
"Jump to a word start between window start and point. "Jump to a word start between window start and point.
@ -1347,7 +1365,10 @@ When SYMBOL is non-nil, jump to symbol start instead of word start."
(concat (concat
(if symbol "\\_<" "\\b") (if symbol "\\_<" "\\b")
str))))) str)))))
(avy--generic-jump regex arg beg end)))) (avy-jump regex
:window-flip arg
:beg beg
:end end))))
;;;###autoload ;;;###autoload
(defun avy-goto-word-1-above (char &optional arg) (defun avy-goto-word-1-above (char &optional arg)
@ -2064,9 +2085,8 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(let* ((org-reverse-note-order t) (let* ((org-reverse-note-order t)
(marker (save-excursion (marker (save-excursion
(avy-with avy-goto-line (avy-with avy-goto-line
(unless (eq 't (avy--generic-jump (rx bol (1+ "*") (1+ space)) (unless (eq 't (avy-jump (rx bol (1+ "*") (1+ space))))
nil)) ;; `avy-jump' returns t when aborted with C-g.
;; `avy--generic-jump' returns t when aborted with C-g.
(point-marker))))) (point-marker)))))
(filename (buffer-file-name (or (buffer-base-buffer (marker-buffer marker)) (filename (buffer-file-name (or (buffer-base-buffer (marker-buffer marker))
(marker-buffer marker)))) (marker-buffer marker))))