[elpa] master 3b9a60a 09/78: avy.el (avy-dispatch-alist): Upgrade to defcustom

[Oleh Krehel]

branch: master
commit 3b9a60a334e1201eb0d088fecdced14659e3f420
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    avy.el (avy-dispatch-alist): Upgrade to defcustom
    
    * avy.el (avy-handler-default): `avy-dispatch-alist' is actually an
      alist now.
---
 avy.el |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/avy.el b/avy.el
index 24234c0..b65ce16 100644
--- a/avy.el
+++ b/avy.el
@@ -115,6 +115,23 @@ If the commands isn't on the list, `avy-style' is used."
                        (const :tag "Post" post)
                        (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
   "When non-nil, a gray background will be added during the selection."
   :type 'boolean)
@@ -316,22 +333,12 @@ KEYS is the path from the root of `avy-tree' to LEAF."
 (defvar avy-action nil
   "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)
   "The default handler for a bad CHAR."
   (let (dispatch)
     (if (setq dispatch (assoc char avy-dispatch-alist))
         (progn
-          (setq avy-action (cadr dispatch))
+          (setq avy-action (cdr dispatch))
           (throw 'done 'restart))
       (signal 'user-error (list "No such candidate" char))
       (throw 'done nil))))