[Emacs-diffs] Changes to emacs/lisp/ido.el,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  08/09/04 10:01:46

Index: ido.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ido.el,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- ido.el      31 Aug 2008 13:57:48 -0000      1.147
+++ ido.el      4 Sep 2008 10:01:45 -0000       1.148
@@ -2161,7 +2161,9 @@
 
       (cond
        ((eq ido-exit 'find-file)
-       (ido-file-internal ido-default-file-method nil nil nil nil ido-text))
+       (ido-file-internal
+        (if (memq method '(other-window other-frame)) method 
ido-default-file-method)
+        nil nil nil nil ido-text))
 
        ((eq ido-exit 'insert-file)
        (ido-file-internal 'insert 'insert-file nil "Insert file: " nil 
ido-text 'ido-enter-insert-buffer))
@@ -2317,7 +2319,9 @@
          (call-interactively this-command)))
 
        ((eq ido-exit 'switch-to-buffer)
-       (ido-buffer-internal ido-default-buffer-method nil nil nil ido-text))
+       (ido-buffer-internal
+        (if (memq method '(other-window other-frame)) method 
ido-default-buffer-method)
+        nil nil nil ido-text))
 
        ((eq ido-exit 'insert-buffer)
        (ido-buffer-internal 'insert 'insert-buffer "Insert buffer: " nil 
ido-text 'ido-enter-insert-file))