1 files changed, 17 insertions, 32 deletions

diff --git a/lisp/window.el b/lisp/window.el
index 3a229a4e447..24d95f367e4 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3785,17 +3785,6 @@ subwindows can get as small as `window-safe-min-height' and
         (window-state-put-2 ignore))
       (window-check frame))))
 
-(defvar display-buffer-window nil
-  "Window used by `display-buffer' and related information.
-After `display-buffer' displays a buffer in some window this
-variable is a cons cell whose car denotes the window used to
-display the buffer.  The cdr is supposed to be one of the symbols
-`reuse-buffer-window', `reuse-other-window', `new-window' or
-`new-frame'.
-
-See the function `display-buffer-record-window' for how this
-variable can be assigned a value.")
-
 (defun display-buffer-record-window (type window buffer)
   "Record information for window used by `display-buffer'.
 TYPE must be one of the symbols reuse-window, pop-up-window, or
@@ -3804,15 +3793,13 @@ pop-up-frame.  WINDOW is the window used for or created by the
 displayed."
   (cond
    ((eq type 'reuse-window)
-    ;; In `display-buffer-window' record whether we used a window on the
-    ;; same buffer or another one.
-    (if (eq (window-buffer window) buffer)
-        (setq display-buffer-window
-              (cons window 'reuse-buffer-window))
-      (setq display-buffer-window
-            (cons window 'reuse-other-window)))
-    ;; In quit-restore parameter record information about the old buffer
-    ;; unless such information exists already.
+    ;; In `help-setup' window parameter record whether we used a window
+    ;; on the same buffer or another one.
+    (set-window-parameter
+     window 'help-setup
+     (if (eq (window-buffer window) buffer) 'reuse-same 'reuse-other))
+    ;; In `quit-restore' parameter record information about the old
+    ;; buffer unless such information exists already.
     (unless (window-parameter window 'quit-restore)
       (set-window-parameter
        window 'quit-restore
@@ -3820,15 +3807,15 @@ displayed."
              (window-point window) buffer
              (window-total-size window) (selected-window)))))
    ((eq type 'pop-up-window)
-    ;; In `display-buffer-window' record window as new.
-    (setq display-buffer-window (cons window 'new-window))
+    ;; In `help-setup' window parameter record window as new.
+    (set-window-parameter window 'help-setup 'new-window)
     ;; In `quit-restore' parameter record that we popped up this window,
     ;; its buffer, and which window was selected before.
     (set-window-parameter
      window 'quit-restore (list 'new-window buffer (selected-window))))
    ((eq type 'pop-up-frame)
-    ;; In `display-buffer-window' record window as on new frame.
-    (setq display-buffer-window (cons window 'new-frame))
+    ;; In `help-setup' window parameter record window as on new frame.
+    (set-window-parameter window 'help-setup 'new-frame)
     ;; In `quit-restore' parameter record that we popped up this window
     ;; on a new frame, the buffer, and which window was selected before.
     (set-window-parameter
@@ -3841,9 +3828,8 @@ means that the currently selected window is not acceptable.  It
 should choose or create a window, display the specified buffer in
 it, and return the window.
 
-The function specified here is responsible for setting the value
-of `display-buffer-window' and the quit-restore parameter of the
-window used."
+The function specified here is responsible for setting the
+quit-restore and help-setup parameters of the window used."
   :type '(choice
           (const nil)
           (function :tag "function"))
@@ -3913,8 +3899,8 @@ second.  If `special-display-function' specifies some other
 function, that function is called with the buffer named
 BUFFER-NAME as first, and the element's cdr as second argument.
 In any case, that function is responsible for setting the value
-of `display-buffer-window' and the quit-restore parameter of the
-window used.
+The function specified here is responsible for setting the
+quit-restore and help-setup parameters of the window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -4115,9 +4101,8 @@ A buffer is special when its name is either listed in
 `special-display-buffer-names' or matches a regexp in
 `special-display-regexps'.
 
-The function specified here is responsible for setting the value
-of `display-buffer-window' and the quit-restore parameter of the
-window used."
+The function specified here is responsible for setting the
+quit-restore and help-setup parameters of the window used."
   :type 'function
   :group 'frames)