From: João Távora <joaotavora@gmail.com>
Date: Wed, 25 Dec 2019 17:57:20 +0000 (+0000)
Subject: Don't force completion recalculation in icomplete-fido-ret
X-Git-Tag: emacs-27.0.90~237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2a349ba8d;p=emacs.git

Don't force completion recalculation in icomplete-fido-ret

Besides the adverse effect of delaying completions, it tripped up the
useful logic of icomplete-force-complete-and-exit in the case where a
default was available, but no completions calculated yet.

* lisp/icomplete.el (icomplete-fido-ret): Don't force calculation
of completions.

(cherry picked from commit 13778aa5be7bf028893672d84c2a291f491d8216)
---

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 5126c035de1..3b3cabb890e 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -276,15 +276,13 @@ require user confirmation."
   (interactive)
   (let* ((dir (and (eq (icomplete--category) 'file)
                    (file-name-directory (icomplete--field-string))))
-         (current (car (completion-all-sorted-completions)))
+         (current (car completion-all-sorted-completions))
          (probe (and dir current
                      (expand-file-name (directory-file-name current) dir))))
     (cond ((and probe (file-directory-p probe) (not (string= current "./")))
            (icomplete-force-complete))
-          (current
-           (icomplete-force-complete-and-exit))
           (t
-           (exit-minibuffer)))))
+           (icomplete-force-complete-and-exit)))))
 
 (defun icomplete-fido-backward-updir ()
   "Delete char before or go up directory, like `ido-mode'."