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

Expose chars to be read as args.

Browse Source
This commit is contained in:
Yang Zhao 2015-05-16 21:53:09 -07:00
parent ea6f5c5953
commit 59c6b9d15e
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
avy.el
View File

@ -516,29 +516,31 @@ STYLE determines the leading char overlay style."
;;* Commands ;;* Commands
;;;###autoload ;;;###autoload
(defun avy-goto-char (&optional arg) (defun avy-goto-char (arg char)
"Read one char and jump to it. "Read one char and jump to it.
The window scope is determined by `avy-all-windows' (ARG negates it)." The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P") (interactive (list current-prefix-arg
(read-char "char: ")))
(avy--with-avy-keys avy-goto-char (avy--with-avy-keys avy-goto-char
(avy--generic-jump (avy--generic-jump
(let ((c (read-char "char: "))) (if (= 13 char)
(if (= 13 c)
"\n" "\n"
(regexp-quote (string c)))) (regexp-quote (string char)))
arg arg
avy-style))) avy-style)))
;;;###autoload ;;;###autoload
(defun avy-goto-char-2 (&optional arg) (defun avy-goto-char-2 (arg char1 char2)
"Read two consecutive chars and jump to the first one. "Read two consecutive chars and jump to the first one.
The window scope is determined by `avy-all-windows' (ARG negates it)." The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P") (interactive (list current-prefix-arg
(read-char "char 1: ")
(read-char "char 2: ")))
(avy--with-avy-keys avy-goto-char-2 (avy--with-avy-keys avy-goto-char-2
(avy--generic-jump (avy--generic-jump
(regexp-quote (string (regexp-quote (string
(read-char "char 1: ") char1
(read-char "char 2: "))) char2))
arg arg
avy-style))) avy-style)))
@ -564,12 +566,13 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(avy--generic-jump "\\b\\sw" arg avy-style))) (avy--generic-jump "\\b\\sw" arg avy-style)))
;;;###autoload ;;;###autoload
(defun avy-goto-word-1 (&optional arg) (defun avy-goto-word-1 (arg char)
"Read one char at word start and jump there. "Read one char at word start and jump there.
The window scope is determined by `avy-all-windows' (ARG negates it)." The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P") (interactive (list current-prefix-arg
(read-char "char: ")))
(avy--with-avy-keys avy-goto-word-1 (avy--with-avy-keys avy-goto-word-1
(let* ((str (string (read-char "char: "))) (let* ((str (string char))
(regex (cond ((string= str ".") (regex (cond ((string= str ".")
"\\.") "\\.")
((and avy-word-punc-regexp ((and avy-word-punc-regexp
@ -612,13 +615,14 @@ should return true."
(avy--process 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 (arg char)
"Prompt for a subword start char and jump there. "Prompt for a subword start char and jump there.
The window scope is determined by `avy-all-windows' (ARG negates it). The window scope is determined by `avy-all-windows' (ARG negates it).
The case is ignored." The case is ignored."
(interactive "P") (interactive (list current-prefix-arg
(read-char "char: ")))
(avy--with-avy-keys avy-goto-subword-1 (avy--with-avy-keys avy-goto-subword-1
(let ((char (downcase (read-char "char: ")))) (let ((char (downcase char)))
(avy-goto-subword-0 (avy-goto-subword-0
arg (lambda () (eq (downcase (char-after)) char)))))) arg (lambda () (eq (downcase (char-after)) char))))))