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

Add avy-goto-subword-1

Browse Source 
Fixes #8
This commit is contained in:
Oleh Krehel 2015-05-08 11:36:10 +02:00
parent b2112e0fe9
commit ca1ca04647
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
avy-jump.el
View File

@ -329,9 +329,13 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(declare-function subword-backward "subword") (declare-function subword-backward "subword")
;;;###autoload ;;;###autoload
(defun avy-goto-subword-0 (&optional arg) (defun avy-goto-subword-0 (&optional arg predicate)
"Jump to a word or subword start. "Jump to a word or subword start.
The window scope is determined by `avy-all-windows' (ARG negates it)."
The window scope is determined by `avy-all-windows' (ARG negates it).
When PREDICATE is non-nil it's a function of zero parameters that
should return true."
(interactive "P") (interactive "P")
(require 'subword) (require 'subword)
(let ((avy-keys (number-sequence ?a ?z)) (let ((avy-keys (number-sequence ?a ?z))
@ -343,11 +347,23 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(goto-char (window-end (selected-window) t)) (goto-char (window-end (selected-window) t))
(subword-backward) (subword-backward)
(while (> (point) ws) (while (> (point) ws)
(push (cons (point) (selected-window)) candidates) (when (or (null predicate)
(and predicate (funcall predicate)))
(push (cons (point) (selected-window)) candidates))
(subword-backward))))) (subword-backward)))))
(avy--goto (avy--goto
(avy--process candidates (avy--style-fn avy-goto-word-style))))) (avy--process candidates (avy--style-fn avy-goto-word-style)))))
;;;###autoload
(defun avy-goto-subword-1 (&optional arg)
"Prompt for a subword start char and jump there.
The window scope is determined by `avy-all-windows' (ARG negates it).
The case is ignored."
(interactive "P")
(let ((char (downcase (read-char "char: "))))
(avy-goto-subword-0
arg (lambda () (eq (downcase (char-after)) char)))))
(defun avy--line (&optional arg) (defun avy--line (&optional arg)
"Select line in current window." "Select line in current window."
(let ((avy-background nil) (let ((avy-background nil)