From: João Távora <joaotavora@gmail.com>
Date: Mon, 4 Feb 2019 16:00:15 +0000 (+0000)
Subject: Add new icomplete-force-complete-and-exit-unless-directory command
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fscratch%2Fsome-more-icomplete-hacks;p=emacs.git

Add new icomplete-force-complete-and-exit-unless-directory command

Useful if you want icomplete to behave a little more like Ido.

(define-key icomplete-minibuffer-map (kbd "RET")
'icomplete-force-complete-and-exit-unless-directory)

* lisp/icomplete.el
  (icomplete-force-complete-and-exit-unless-directory): New command.
---

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 102ebb9526f..67c8ef661f2 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -167,6 +167,19 @@ the default otherwise."
       (minibuffer-force-complete-and-exit)
     (minibuffer-complete-and-exit)))
 
+(defun icomplete-force-complete-and-exit-unless-directory ()
+  "Complete minibuffer, don't exit if completing a directory."
+  (interactive)
+  (minibuffer-force-complete nil nil 'dont-cycle)
+  (let* ((meta (cdr (funcall minibuffer-completion-table
+                             nil nil 'metadata)))
+         (category (cdr (assq 'category meta))))
+    (unless (and (eq 'file category)
+                 (file-directory-p
+                  (buffer-substring-no-properties (icomplete--field-beg)
+                                                  (icomplete--field-end))))
+      (minibuffer-complete-and-exit))))
+
 (defun icomplete-force-complete-and-kill ()
   "Complete minibuffer, kill current prospect, don't exit.
 Killing the current prospect has different meanings according to