1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

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).
This commit is contained in:
Lars Ingebrigtsen 2019-11-17 10:40:11 +01:00
parent ca3eb85495
commit 58ceb8bac0

View file

@ -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)