summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-11-30 20:27:56 -0500
committerGlenn Morris <rgm@gnu.org>2012-11-30 20:27:56 -0500
commita940045887decb3ace683daaf6f190d8e49f37d6 (patch)
tree602510f721dc3c28fc2a31db3901e36147be1f41
parent00054d2199d929eb224ae62dec2e55608ff1c07f (diff)
downloademacs-a940045887decb3ace683daaf6f190d8e49f37d6.tar.gz
ido.el fix for bug#13036
* lisp/ido.el (ido-file-internal): Handle other-window, other-frame for dired.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ido.el5
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))