Commit 7aec04aa authored by Kyle Meyer's avatar Kyle Meyer

Reposition ivy and helm sort function declarations

Move them to where they are in master.

This is equivalent to reverting f19d9065 (Silence byte-compiler,
2018-06-15) and cherry picking 06189617 (magit-utils.el: Declare
ivy-sort-functions-alist, 2018-06-15).
parent eeb95f89
...@@ -352,6 +352,9 @@ and delay of your graphical environment or operating system." ...@@ -352,6 +352,9 @@ and delay of your graphical environment or operating system."
;;; User Input ;;; User Input
(defvar helm-completion-in-region-default-sort-fn)
(defvar ivy-sort-functions-alist)
(defvar magit-completing-read--silent-default nil) (defvar magit-completing-read--silent-default nil)
(defun magit-completing-read (prompt collection &optional (defun magit-completing-read (prompt collection &optional
...@@ -432,8 +435,6 @@ acts similarly to `completing-read', except for the following: ...@@ -432,8 +435,6 @@ acts similarly to `completing-read', except for the following:
'(metadata (display-sort-function . identity)) '(metadata (display-sort-function . identity))
(complete-with-action action collection string pred)))) (complete-with-action action collection string pred))))
(defvar ivy-sort-functions-alist)
(defun magit-builtin-completing-read (defun magit-builtin-completing-read
(prompt choices &optional predicate require-match initial-input hist def) (prompt choices &optional predicate require-match initial-input hist def)
"Magit wrapper for standard `completing-read' function." "Magit wrapper for standard `completing-read' function."
...@@ -448,8 +449,6 @@ acts similarly to `completing-read', except for the following: ...@@ -448,8 +449,6 @@ acts similarly to `completing-read', except for the following:
predicate require-match predicate require-match
initial-input hist def)))) initial-input hist def))))
(defvar helm-completion-in-region-default-sort-fn)
(defun magit-completing-read-multiple (defun magit-completing-read-multiple
(prompt choices &optional sep default hist keymap) (prompt choices &optional sep default hist keymap)
"Read multiple items from CHOICES, separated by SEP. "Read multiple items from CHOICES, separated by SEP.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment