diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-11-17 10:40:11 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-11-17 10:40:11 +0100 |
| commit | 58ceb8bac0bcd9907ca8ff8fd37d5a6c2ce282ca (patch) | |
| tree | 1adea348c3773bfc2c75f8c3220bc20fdde3cba4 /lisp/ido.el | |
| parent | ca3eb85495e61b7255c2c5466fd1cdae7c9fa8d4 (diff) | |
| download | emacs-58ceb8bac0bcd9907ca8ff8fd37d5a6c2ce282ca.tar.gz | |
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).
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 10 |
1 files changed, 6 insertions, 4 deletions
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) |