mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-11 08:41:48 -07:00
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 13778aa5be)
This commit is contained in:
parent
9b1053ba27
commit
f2a349ba8d
1 changed files with 2 additions and 4 deletions
|
|
@ -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'."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue