[Emacs-diffs] master 623d37a: * lisp/files.el (find-alternate-file): Use selected-window even if dedicated

[Stefan Monnier]

branch: master
commit 623d37a1f2b805e9d3d1954d762ee1dada736991
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/files.el (find-alternate-file): Use selected-window even if dedicated
---
 lisp/files.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/files.el b/lisp/files.el
index 205001e..a7ad40b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1801,7 +1801,11 @@ killed."
          (setq buffer-file-truename nil)
          ;; Likewise for dired buffers.
          (setq dired-directory nil)
-         (find-file filename wildcards))
+          ;; Don't use `find-file' because it may end up using another window
+          ;; in some corner cases, e.g. when the selected window is
+          ;; softly-dedicated.
+         (let ((newbuf (find-file-noselect filename wildcards)))
+            (switch-to-buffer newbuf)))
       (when (eq obuf (current-buffer))
        ;; This executes if find-file gets an error
        ;; and does not really find anything.