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-goto-char will now display shortest overlays for cands near point

Browse Source 
Fixes #242
This commit is contained in:
Oleh Krehel 2018-08-08 17:48:18 +02:00
parent 1de623383e
commit c4e2d50d6d
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
avy.el
View File

@ -78,29 +78,39 @@ keys different than the following: a, e, i, o, u, y"
(character :tag "char") (character :tag "char")
(symbol :tag "non-printing key")))) (symbol :tag "non-printing key"))))
(defconst avy--key-type
'(choice :tag "Command"
(const avy-goto-char)
(const avy-goto-char-2)
(const avy-isearch)
(const avy-goto-line)
(const avy-goto-subword-0)
(const avy-goto-subword-1)
(const avy-goto-word-0)
(const avy-goto-word-1)
(const avy-copy-line)
(const avy-copy-region)
(const avy-move-line)
(const avy-move-region)
(const avy-kill-whole-line)
(const avy-kill-region)
(const avy-kill-ring-save-whole-line)
(const avy-kill-ring-save-region)
(function :tag "Other command")))
(defcustom avy-keys-alist nil (defcustom avy-keys-alist nil
"Alist of avy-jump commands to `avy-keys' overriding the default `avy-keys'." "Alist of avy-jump commands to `avy-keys' overriding the default `avy-keys'."
:type '(alist :type `(alist
:key-type (choice :tag "Command" :key-type ,avy--key-type
(const avy-goto-char)
(const avy-goto-char-2)
(const avy-isearch)
(const avy-goto-line)
(const avy-goto-subword-0)
(const avy-goto-subword-1)
(const avy-goto-word-0)
(const avy-goto-word-1)
(const avy-copy-line)
(const avy-copy-region)
(const avy-move-line)
(const avy-move-region)
(const avy-kill-whole-line)
(const avy-kill-region)
(const avy-kill-ring-save-whole-line)
(const avy-kill-ring-save-region)
(function :tag "Other command"))
:value-type (repeat :tag "Keys" character))) :value-type (repeat :tag "Keys" character)))
(defcustom avy-orders-alist '((avy-goto-char . avy-order-closest))
"Alist of candidate ordering functions.
Usually, candidates appear in their point position order."
:type `(alist
:key-type ,avy--key-type
:value-type function))
(defcustom avy-words (defcustom avy-words
'("am" "by" "if" "is" "it" "my" "ox" "up" '("am" "by" "if" "is" "it" "my" "ox" "up"
"ace" "act" "add" "age" "ago" "aim" "air" "ale" "all" "and" "ant" "any" "ace" "act" "add" "age" "ago" "aim" "air" "ale" "all" "and" "ant" "any"
@ -362,11 +372,18 @@ SEQ-LEN is how many elements of KEYS it takes to identify a match."
lst (cdr lst)))))) lst (cdr lst))))))
(nreverse path-alist))) (nreverse path-alist)))
(defun avy-order-closest (x)
(abs (- (caar x) (point))))
(defun avy-tree (lst keys) (defun avy-tree (lst keys)
"Coerce LST into a balanced tree. "Coerce LST into a balanced tree.
The degree of the tree is the length of KEYS. The degree of the tree is the length of KEYS.
KEYS are placed appropriately on internal nodes." KEYS are placed appropriately on internal nodes."
(let ((len (length keys))) (let* ((len (length keys))
(order-fn (cdr (assq avy-command avy-orders-alist)))
(lst (if order-fn
(cl-sort lst #'< :key order-fn)
lst)))
(cl-labels (cl-labels
((rd (ls) ((rd (ls)
(let ((ln (length ls))) (let ((ln (length ls)))