emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master e338785 057/167: ivy.el (ivy-sort-functions-alist): Upgrad


From: Oleh Krehel
Subject: [elpa] master e338785 057/167: ivy.el (ivy-sort-functions-alist): Upgrade to defcustom
Date: Tue, 08 Dec 2015 10:49:53 +0000

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

    ivy.el (ivy-sort-functions-alist): Upgrade to defcustom
    
    Add the proper :type.
---
 ivy.el |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ivy.el b/ivy.el
index e6a9ac9..155d1d5 100644
--- a/ivy.el
+++ b/ivy.el
@@ -837,7 +837,9 @@ Prioritize directories."
         nil
       (string< x y))))
 
-(defvar ivy-sort-functions-alist
+(autoload 'Man-goto-section "man" "" t)
+
+(defcustom ivy-sort-functions-alist
   '((read-file-name-internal . ivy-sort-file-function-default)
     (internal-complete-buffer . nil)
     (counsel-git-grep-function . nil)
@@ -851,7 +853,17 @@ For each entry, nil means no sorting.  It's very useful to 
turn
 off the sorting for functions that have candidates in the natural
 buffer order, like `org-refile' or `Man-goto-section'.
 
-The entry associated to t is used for all fall-through cases.")
+The entry associated to t is used for all fall-through cases."
+  :type
+  '(alist
+    :key-type (choice
+               (const :tag "All other functions" t)
+               (function :tag "Function"))
+    :value-type (choice
+                 (const :tag "plain sort" string-lessp)
+                 (const :tag "file sort" ivy-sort-file-function-default)
+                 (const :tag "no sort" nil)))
+  :group 'ivy)
 
 (defvar ivy-index-functions-alist
   '((swiper . ivy-recompute-index-swiper)
@@ -1119,7 +1131,7 @@ This is useful for recursive `ivy-read'."
                  prompt)
                 ((null ivy-count-format)
                  (error
-                  "`ivy-count-format' can't be nil. Set it to an empty string 
instead."))
+                  "`ivy-count-format' can't be nil.  Set it to an empty string 
instead"))
                 ((string-match "%d.*%d" ivy-count-format)
                  (let ((w (length (number-to-string
                                    (length ivy--all-candidates))))
@@ -1151,7 +1163,7 @@ it can be used for `completing-read-function'.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 COLLECTION can be a list of strings, an alist, an obarray or a hash table.
 PREDICATE limits completion to a subset of COLLECTION.
-REQUIRE-MATCH is considered boolean. See `completing-read'.
+REQUIRE-MATCH is considered boolean.  See `completing-read'.
 INITIAL-INPUT is a string that can be inserted into the minibuffer initially.
 _HISTORY is ignored for now.
 DEF is the default value.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]