[Emacs-diffs] /srv/bzr/emacs/trunk r111045: ido.el fix for bug#13036

[Glenn Morris]

------------------------------------------------------------
revno: 111045
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-30 20:27:56 -0500
message:
  ido.el fix for bug#13036
  
  * lisp/ido.el (ido-file-internal): Handle other-window, other-frame for dired.
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-30 17:09:55 +0000
+++ b/lisp/ChangeLog    2012-12-01 01:27:56 +0000
@@ -1,3 +1,8 @@
+2012-12-01  Glenn Morris  <address@hidden>
+
+       * ido.el (ido-file-internal):
+       Handle other-window, other-frame for dired.  (Bug#13036)
+
 2012-11-30  Glenn Morris  <address@hidden>
 
        * icomplete.el (icomplete-separator): Fix :version.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2012-11-10 23:13:33 +0000
+++ b/lisp/ido.el       2012-12-01 01:27:56 +0000
@@ -2389,7 +2389,10 @@
        (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))