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

avy.el (avy-dispatch-alist): Upgrade to defcustom

Browse Source 
* avy.el (avy-handler-default): `avy-dispatch-alist' is actually an
  alist now.
This commit is contained in:
Oleh Krehel 2015-07-16 16:07:28 +02:00
parent a6db8a3506
commit 3b9a60a334
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
avy.el
View File

@ -115,6 +115,23 @@ If the commands isn't on the list, `avy-style' is used."
(const :tag "Post" post) (const :tag "Post" post)
(const :tag "De Bruijn" de-bruijn)))) (const :tag "De Bruijn" de-bruijn))))
(defcustom avy-dispatch-alist
'((?x . avy-action-kill)
(?m . avy-action-mark)
(?n . avy-action-copy))
"List of actions for `avy-handler-default'.
Each item is (KEY . ACTION). When KEY not on `avy-keys' is
pressed during the dispatch, ACTION is set to replace the default
`avy-action-goto' once a candidate is finally selected."
:type
'(alist
:key-type (choice (character :tag "Char"))
:value-type (choice
(const :tag "Mark" avy-action-mark)
(const :tag "Copy" avy-action-copy)
(const :tag "Kill" avy-action-kill))))
(defcustom avy-background nil (defcustom avy-background nil
"When non-nil, a gray background will be added during the selection." "When non-nil, a gray background will be added during the selection."
:type 'boolean) :type 'boolean)
@ -316,22 +333,12 @@ KEYS is the path from the root of `avy-tree' to LEAF."
(defvar avy-action nil (defvar avy-action nil
"Function to call at the end of select.") "Function to call at the end of select.")
(defvar avy-dispatch-alist
'((?x avy-action-kill)
(?m avy-action-mark)
(?n avy-action-copy))
"List of actions for `avy-handler-default'.
Each item is (KEY ACTION). When KEY that is not on `avy-keys' is
pressed during the dispatch, ACTION is set to replace the default
`avy-action-goto' once a candidate is finally selected.")
(defun avy-handler-default (char) (defun avy-handler-default (char)
"The default handler for a bad CHAR." "The default handler for a bad CHAR."
(let (dispatch) (let (dispatch)
(if (setq dispatch (assoc char avy-dispatch-alist)) (if (setq dispatch (assoc char avy-dispatch-alist))
(progn (progn
(setq avy-action (cadr dispatch)) (setq avy-action (cdr dispatch))
(throw 'done 'restart)) (throw 'done 'restart))
(signal 'user-error (list "No such candidate" char)) (signal 'user-error (list "No such candidate" char))
(throw 'done nil)))) (throw 'done nil))))