auto upstream

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69492f03682..1bcb633b06f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-01  Glenn Morris  <rgm@gnu.org>
+
+        * ido.el (ido-file-internal):
+        Handle other-window, other-frame for dired.  (Bug#13036)
+
 2012-11-30  Glenn Morris  <rgm@gnu.org>
 
         * icomplete.el (icomplete-separator): Fix :version.
diff --git a/lisp/ido.el b/lisp/ido.el
index f4f9c27c847..7044fa496db 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2389,7 +2389,10 @@ If cursor is not at the end of the user input, move to end of input."
         (ido-buffer-internal 'insert 'insert-buffer "Insert buffer: " nil ido-text 'ido-enter-insert-file))
 
        ((eq ido-exit 'dired)
-        (dired (concat ido-current-directory (or ido-text ""))))
+        (funcall (cond ((eq method 'other-window) 'dired-other-window)
+                       ((eq method 'other-frame) 'dired-other-frame)
+                       (t 'dired))
+                 (concat ido-current-directory (or ido-text ""))))
 
        ((eq ido-exit 'ffap)
         (find-file-at-point))