changeset 55361:c1239eb451dc

(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.
author Kim F. Storm <storm@cua.dk>
date Tue, 04 May 2004 13:27:02 +0000
parents 5ffb2bba3549
children b12eb39818e1
files lisp/ido.el
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ido.el	Tue May 04 13:26:05 2004 +0000
+++ b/lisp/ido.el	Tue May 04 13:27:02 2004 +0000
@@ -3808,15 +3808,19 @@
 
 ;;; 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