diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d531125400d..ff61568a8f2 100644 --- 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 40e2df14c1b..acff3395019 100644 --- 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. |