(ido-read-file-name): If command has ido property, don't use ido

if value is ignore, or read as directory if value is dir.
Set ido ignore property for dired-do-rename command.

diff --git a/lisp/ido.el b/lisp/ido.el
index 180e9dbb1c83454bf4ce80b0554a82f495a333bc..5d2db9803732cf247287947eae16a39fcce0d29a 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3808,15 +3808,19 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
 
 ;;; Helper functions for other programs
 
+(put 'dired-do-rename 'ido 'ignore)
+
 ;;;###autoload
 (defun ido-read-file-name (prompt &optional dir default-filename mustmatch initial predicate)
   "Read file name, prompting with PROMPT and completing in directory DIR.
 See `read-file-name' for additional parameters."
   (cond
   ((or (eq predicate 'file-directory-p)
+       (eq (get this-command 'ido) 'dir)
        (memq this-command ido-read-file-name-as-directory-commands))
    (ido-read-directory-name prompt dir default-filename mustmatch initial))
-  ((and (not (memq this-command ido-read-file-name-non-ido))
+  ((and (not (eq (get this-command 'ido) 'ignore))
+       (not (memq this-command ido-read-file-name-non-ido))
        (or (null predicate) (eq predicate 'file-exists-p)))
    (let* (filename
          ido-saved-vc-hb