summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ido.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf15e2a21c6..8171f7ba446 100644
--- 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 b32c1d00bc2..9c4e56544cb 100644
--- 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)