Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thierry Volpiatto committed Dec 14, 2019
2 parents 494fb2f + 8dd27b7 commit 8c49abe
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions helm-command.el
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
:group 'helm-command
:type 'boolean)

(defcustom helm-M-x-default-sort-fn #'helm-M-x-fuzzy-sort-candidates
"Default sort function for `helm-M-x' with fuzzy matching.
It should sort against REAL value of candidates."
:group 'helm-command
:type 'function)

;;; Faces
;;
Expand Down Expand Up @@ -178,9 +172,6 @@ fuzzy matching is running its own sort function with a different algorithm."
(universal-argument--mode)))
(put 'helm-M-x-universal-argument 'helm-only t)

(defun helm-M-x-fuzzy-sort-candidates (candidates _source)
(helm-fuzzy-matching-default-sort-fn-1 candidates t))

(defun helm-M-x-persistent-action (candidate)
(helm-elisp--persistent-help
candidate 'helm-describe-function))
Expand Down Expand Up @@ -215,8 +206,7 @@ Arg COLLECTION should be an `obarray' but can be any object suitable
for `try-completion'. Arg PREDICATE is a function that default to
`commandp' see also `try-completion'.
Arg HISTORY default to `extended-command-history'."
(let* ((helm-fuzzy-sort-fn helm-M-x-default-sort-fn)
(helm--mode-line-display-prefarg t)
(let* ((helm--mode-line-display-prefarg t)
(tm (run-at-time 1 0.1 'helm-M-x--notify-prefix-arg))
(minibuffer-completion-confirm t)
(pred (or predicate #'commandp))
Expand Down

0 comments on commit 8c49abe

Please sign in to comment.