summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2020-03-05 01:58:32 +0200
committerDmitry Gutov <dgutov@yandex.ru>2020-03-05 01:58:32 +0200
commit8ffa10a80a7448eaf478df8f3fd2d6edf86d549b (patch)
tree502368ef120a86bdcbfec822668d18199de978d6
parent97213d71f8773e9e04f7caa7f147442b2aec164d (diff)
downloademacs-fido-mode-fix.tar.gz
icomplete-fido-exit: New command for the M-j bindingfido-mode-fix
* lisp/icomplete.el (icomplete-fido-exit): New command. (icomplete-fido-mode-map): Use it (bug#38992).
-rw-r--r--lisp/icomplete.el9
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index efe64d855a2..0a655d1e9e9 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -284,6 +284,13 @@ 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
+ (minibuffer-complete-and-exit)
+ (exit-minibuffer)))
+
(defun icomplete-fido-backward-updir ()
"Delete char before or go up directory, like `ido-mode'."
(interactive)
@@ -299,7 +306,7 @@ require user confirmation."
(define-key map (kbd "RET") 'icomplete-fido-ret)
(define-key map (kbd "C-m") 'icomplete-fido-ret)
(define-key map (kbd "DEL") 'icomplete-fido-backward-updir)
- (define-key map (kbd "M-j") 'exit-minibuffer)
+ (define-key map (kbd "M-j") 'icomplete-fido-exit)
(define-key map (kbd "C-s") 'icomplete-forward-completions)
(define-key map (kbd "C-r") 'icomplete-backward-completions)
(define-key map (kbd "<right>") 'icomplete-forward-completions)