* ido.el (dired-do-copy, dired): Set 'ido property.

Fixes: debbugs:11954

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf15e2a21c6ceafcb567ecdf7938103b7cfd1151..8171f7ba44666fdf42189bf1712372e1d4dbc847 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-12  Leo Liu  <sdl.web@gmail.com>
+
+       * ido.el (dired-do-copy, dired): Set 'ido property.  (Bug#11954)
+
 2013-07-11  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/edebug.el: Require cl-lib at run-time too.

diff --git a/lisp/ido.el b/lisp/ido.el
index b32c1d00bc2f71e8b6498e6f359c72b7d0e782fc..9c4e56544cba7b1a5e84e122f050a473337ffd20 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4727,9 +4727,12 @@ Modified from `icomplete-completions'."
 
 ;;; Helper functions for other programs
 
-(put 'dired-do-rename 'ido 'ignore)
 (put 'ibuffer-find-file 'ido 'find-file)
+(put 'dired 'ido 'dir)
 (put 'dired-other-window 'ido 'dir)
+;; See http://debbugs.gnu.org/11954 for reasons.
+(put 'dired-do-copy 'ido 'ignore)
+(put 'dired-do-rename 'ido 'ignore)
 
 ;;;###autoload
 (defun ido-read-buffer (prompt &optional default require-match)