Fix Custom menus

Custom menus for `ivy-virtual-abbreviate' and `ivy-sort-functions-alist'
now display a better user interface.

Fixes #274

diff --git a/ivy.el b/ivy.el
index 1cbaaf748804182746416158002cad3a15a68a4d..3c0f229114fca3ba7e2be02f31d17da6a0985b03 100644 (file)
--- a/ivy.el
+++ b/ivy.el
@@ -841,8 +841,6 @@ Prioritize directories."
         nil
       (string< x y))))
 
-(autoload 'Man-goto-section "man" "" t)
-
 (defcustom ivy-sort-functions-alist
   '((read-file-name-internal . ivy-sort-file-function-default)
     (internal-complete-buffer . nil)
@@ -862,7 +860,7 @@ The entry associated to t is used for all fall-through cases."
   '(alist
     :key-type (choice
                (const :tag "All other functions" t)
-               (function :tag "Function"))
+               (symbol :tag "Function"))
     :value-type (choice
                  (const :tag "plain sort" string-lessp)
                  (const :tag "file sort" ivy-sort-file-function-default)
@@ -1686,7 +1684,7 @@ CANDIDATES are assumed to be static."
                  nil)
                 ivy--index)))))
 
-(defun ivy-recompute-index-swiper (re-str cands)
+(defun ivy-recompute-index-swiper (_re-str cands)
   (let ((tail (nthcdr ivy--index ivy--old-cands))
         idx)
     (if (and tail ivy--old-cands (not (equal "^" ivy--old-re)))
@@ -1840,8 +1838,8 @@ CANDS is a list of strings."
 (defcustom ivy-virtual-abbreviate 'name
   "The mode of abbreviation for virtual buffer names."
   :type '(choice
-          (const :tag "Only name" 'name)
-          (const :tag "Full path" 'full)
+          (const :tag "Only name" name)
+          (const :tag "Full path" full)
           ;; eventually, uniquify
           ))