From eb3c6ad325ea54acbea047508b5496d130bff93a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Thu, 9 Jan 2020 10:01:16 +0000 Subject: [PATCH] Consider non-string minibuffer-default in icomplete Fixes: bug#38992 * lisp/icomplete.el (icomplete--sorted-completions): Consider non-string minibuffer-default. --- lisp/icomplete.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index e7e8cbf6e0a..ceff11f9bd6 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -448,13 +448,14 @@ Usually run by inclusion in `minibuffer-setup-hook'." with end = (icomplete--field-end) with all = (completion-all-sorted-completions beg end) for fn in (cond ((and minibuffer-default + (stringp minibuffer-default) ; bug#38992 (= (icomplete--field-end) (icomplete--field-beg))) - ;; When we have a non-nil default and no input - ;; whatsoever: we want to make sure that default - ;; is bubbled to the top so that + ;; When we have a non-nil string default and + ;; no input whatsoever: we want to make sure + ;; that default is bubbled to the top so that ;; `icomplete-force-complete-and-exit' will - ;; select it (do that even if the match doesn't - ;; match the completion perfectly. + ;; select it (do that even if the match + ;; doesn't match the completion perfectly. `(,(lambda (comp) (equal minibuffer-default comp)) ,(lambda (comp) -- 2.39.2