[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 fc47e3a 3/4: Let fido-mode users force a minibuffer-exit
From: |
João Távora |
Subject: |
emacs-27 fc47e3a 3/4: Let fido-mode users force a minibuffer-exit |
Date: |
Sat, 7 Mar 2020 09:02:18 -0500 (EST) |
branch: emacs-27
commit fc47e3ad99170649de5f318ab9c6aa06cd353af1
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Let fido-mode users force a minibuffer-exit
* lisp/icomplete.el (icomplete-fido-exit):
Add FORCE arg. Rewrite docstring. (bug#38992)
---
lisp/icomplete.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 0a655d1..66bc731 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -284,10 +284,14 @@ require user confirmation."
(t
(icomplete-force-complete-and-exit)))))
-(defun icomplete-fido-exit ()
- "Exit minibuffer properly honoring the REQUIRE-MATCH argument."
- (interactive)
- (if minibuffer--require-match
+(defun icomplete-fido-exit (force)
+ "Attempt to exit minibuffer immediately with current input.
+Unless FORCE is non-nil (interactively with a prefix argument),
+honour a non-nil REQUIRE-MATCH argument to `completing-read' by
+trying to complete as much as possible and disallowing the exit
+if that doesn't produce a completion match."
+ (interactive "P")
+ (if (and (not force) minibuffer--require-match)
(minibuffer-complete-and-exit)
(exit-minibuffer)))