emacs-diffs
[Top][All Lists]
Advanced

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

master 13778aa 2/2: Don't force completion recalculation in icomplete-fi


From: João Távora
Subject: master 13778aa 2/2: Don't force completion recalculation in icomplete-fido-ret
Date: Wed, 25 Dec 2019 12:58:53 -0500 (EST)

branch: master
commit 13778aa5be7bf028893672d84c2a291f491d8216
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    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.
---
 lisp/icomplete.el | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 5126c03..3b3cabb 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'."



reply via email to

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