[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 f2a349b 6/7: Don't force completion recalculation in icomplete-
From: |
João Távora |
Subject: |
emacs-27 f2a349b 6/7: Don't force completion recalculation in icomplete-fido-ret |
Date: |
Tue, 31 Dec 2019 08:32:05 -0500 (EST) |
branch: emacs-27
commit f2a349ba8d08ab5c3a491661acecd5600d9fb41b
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.
(cherry picked from commit 13778aa5be7bf028893672d84c2a291f491d8216)
---
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'."
- emacs-27 updated (9b6872b -> 195bde9), João Távora, 2019/12/31
- emacs-27 5352947 1/7: Another adjustment to flex completion style's sorting function, João Távora, 2019/12/31
- emacs-27 e3276f3 3/7: Make fido-mode behave more like ido-mode when finding directories, João Távora, 2019/12/31
- emacs-27 b1c3ed9 4/7: Move flex style's minibuffer-default-aware sorting to lisp/icomplete.el, João Távora, 2019/12/31
- emacs-27 9b1053b 5/7: Correctly cache sorted completions in icomplete--sorted-completions, João Távora, 2019/12/31
- emacs-27 fe0ed17 2/7: Slightly simplify lisp/icomplete.el with new icomplete--category helper, João Távora, 2019/12/31
- emacs-27 f2a349b 6/7: Don't force completion recalculation in icomplete-fido-ret,
João Távora <=
- emacs-27 195bde9 7/7: Don't always resort in recently introduced icomplete--sorted-completions, João Távora, 2019/12/31