* lisp/files.el (find-file): Always use selected-window.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d531125400d452c3459c06ec8ebe560feeebdf50..ff61568a8f28c76f93b6ab079c81e56d3135a2a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * files.el (find-file): Always use selected-window.
+
 2011-11-07  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window-combinations): Make WINDOW argument

diff --git a/lisp/files.el b/lisp/files.el
index 40e2df14c1b5ee5693cda57f995632ab6db75264..acff3395019a1c67aa7b9707e1474e5b79d25c0b 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1343,7 +1343,7 @@ automatically choosing a major mode, use \\[find-file-literally]."
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
        (mapcar 'switch-to-buffer (nreverse value))
-      (switch-to-buffer value))))
+      (switch-to-buffer value nil 'force-same-window))))
 
 (defun find-file-other-window (filename &optional wildcards)
   "Edit file FILENAME, in another window.