>From c4130a620f913422c520c2ccf648eb409035e1d9 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 24 Jan 2020 01:06:17 +0300 Subject: [PATCH 2/2] Make M-j in fido-mode honor REQUIRE-MATCH=t --- lisp/icomplete.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 52429fdf37..5e674b769d 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -284,6 +284,13 @@ icomplete-fido-ret (t (icomplete-force-complete-and-exit))))) +(defun icomplete-fido-exit () + "Exit minibuffer properly honoring `minibuffer-completion-confirm'." + (interactive) + (if minibuffer-completion-confirm + (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 @@ icomplete-fido-mode-map (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 "") 'icomplete-forward-completions) -- 2.20.1