2 files changed, 8 insertions, 2 deletions

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b2dd3d99583..3116659cd03 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2597,6 +2597,9 @@ If @var{alist} has a @code{previous-window} entry and the window
 specified by that entry is live and not dedicated to another buffer,
 that window will be preferred, even if it never showed @var{buffer}
 before.
+
+This function will not choose the selected window if it finds another
+eligible window that has shown @var{buffer} previously.
 @end defun
 
 @defun display-buffer-use-some-window buffer alist
diff --git a/lisp/window.el b/lisp/window.el
index 58e22a2306a..c2d5b02be05 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7473,8 +7473,11 @@ selected frame if `display-buffer-reuse-frames' and
 terminal if either of those variables is non-nil.
 
 If ALIST has a `previous-window' entry, the window specified by
-that entry will override any other window found by the methods
-above, even if that window never showed BUFFER before."
+that entry may override any other window found by the methods
+above, even if that window never showed BUFFER before.
+
+Avoid using the selected window if another eligible window has
+shown BUFFER before."
   (let* ((alist-entry (assq 'reusable-frames alist))
          (inhibit-same-window
           (cdr (assq 'inhibit-same-window alist)))