[Emacs-diffs] Changes to emacs/src/window.c

[Richard M. Stallman]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.408 emacs/src/window.c:1.409
*** emacs/src/window.c:1.408    Mon Mar  4 18:40:59 2002
--- emacs/src/window.c  Tue Mar 26 04:09:56 2002
***************
*** 2898,2904 ****
  argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg).
  If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.
  Returns the window displaying BUFFER.
! If `display-reuse-frames' is non-nil, and another frame is currently
  displaying BUFFER, then simply raise that frame.
  
  The variables `special-display-buffer-names', `special-display-regexps',
--- 2898,2904 ----
  argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg).
  If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.
  Returns the window displaying BUFFER.
! If `display-buffer-reuse-frames' is non-nil, and another frame is currently
  displaying BUFFER, then simply raise that frame.
  
  The variables `special-display-buffer-names', `special-display-regexps',
***************
*** 2946,2952 ****
        }
      }
  
!   /* If the user wants pop-up-frames or display-reuse-frames, then
       look for a window showing BUFFER on any visible or iconified frame.
       Otherwise search only the current frame.  */
    if (! NILP (frame))
--- 2946,2952 ----
        }
      }
  
!   /* If the user wants pop-up-frames or display-buffer-reuse-frames,
       look for a window showing BUFFER on any visible or iconified frame.
       Otherwise search only the current frame.  */
    if (! NILP (frame))