From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Nov 2019 09:40:11 +0000 (+0100)
Subject: Make ido-read-file-name respect ido-read-file-name-non-ido more
X-Git-Tag: emacs-27.0.90~589
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58ceb8bac0bcd9907ca8ff8fd37d5a6c2ce282ca;p=emacs.git

Make ido-read-file-name respect ido-read-file-name-non-ido more

* lisp/ido.el (ido-read-file-name): Respect
ido-read-file-name-non-ido in the file-directory-p case, too
(bug#38231).
---

diff --git a/lisp/ido.el b/lisp/ido.el
index 2a660e6b0ce..79f259b8198 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4906,10 +4906,12 @@ Read file name, prompting with PROMPT and completing in directory DIR.
 See `read-file-name' for additional parameters."
   (let (filename)
     (cond
-     ((or (eq predicate 'file-directory-p)
-	  (eq (and (symbolp this-command)
-		   (get this-command 'ido)) 'dir)
-	  (memq this-command ido-read-file-name-as-directory-commands))
+     ((and (not (memq this-command ido-read-file-name-non-ido))
+           (or (eq predicate 'file-directory-p)
+	       (eq (and (symbolp this-command)
+                        (get this-command 'ido))
+                   'dir)
+	       (memq this-command ido-read-file-name-as-directory-commands)))
       (setq filename
 	    (ido-read-directory-name prompt dir default-filename mustmatch initial)))
      ((and (not (eq (and (symbolp this-command)