* lisp/files.el (find-alternate-file): Use selected-window even if dedicated

diff --git a/lisp/files.el b/lisp/files.el
index 205001e5d5a81d9e57b766a76e94a5b3207457ca..a7ad40b76cd35d7eb14f7ddad2a5a6d50ec03cd0 100644 (file)
--- 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.