master 58ceb8b: Make ido-read-file-name respect ido-read-file-name-non-ido more

[Lars Ingebrigtsen]

branch: master
commit 58ceb8bac0bcd9907ca8ff8fd37d5a6c2ce282ca
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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).
---
 lisp/ido.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/ido.el b/lisp/ido.el
index 2a660e6..79f259b 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)