From 14ba4cf3b27a32bb1a583510121ac0be44bbff3c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 7 Sep 2012 18:27:11 +0800 Subject: [PATCH] Remove obsolete display-buffer-reuse-frames from manuals. * doc/emacs/windows.texi (Window Choice): Don't mention obsolete display-buffer-reuse-frames. * doc/lispref/windows.texi (Display Action Functions) (Choosing Window Options): Remove obsolete variable display-buffer-reuse-frames. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/windows.texi | 2 -- doc/lispref/ChangeLog | 4 ++++ doc/lispref/windows.texi | 11 +---------- etc/NEWS | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 78f1d2c8e3b..49c472ca793 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2012-09-07 Chong Yidong + + * windows.texi (Window Choice): Don't mention obsolete + display-buffer-reuse-frames. + 2012-09-04 Paul Eggert Give more-useful info on a fatal error (Bug#12328). diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 2496a505063..04d1353006f 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -378,12 +378,10 @@ adding the desired buffer's name to the list expression to the list @code{same-window-regexps}. By default, these variables are @code{nil}, so this step is skipped. -@vindex display-buffer-reuse-frames @item Otherwise, if the buffer is already displayed in an existing window, ``reuse'' that window. Normally, only windows on the selected frame are considered, but windows on other frames are also reusable if you -change @code{display-buffer-reuse-frames} to @code{t}, or if you change @code{pop-up-frames} (see below) to @code{t}. @item diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 179f81990a7..1e78d20493a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,9 @@ 2012-09-07 Chong Yidong + * windows.texi (Display Action Functions) + (Choosing Window Options): Remove obsolete variable + display-buffer-reuse-frames. + * positions.texi (Narrowing): Document buffer-narrowed-p. * markers.texi (Moving Markers): Add xref to Point (Bug#7151). diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 5fe007ba02d..52bdc9a5fa1 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1728,8 +1728,7 @@ A frame means consider windows on that frame only. @end itemize If @var{alist} contains no @code{reusable-frames} entry, this function -normally searches just the selected frame; however, if either the -variable @code{display-buffer-reuse-frames} or the variable +normally searches just the selected frame; however, if the variable @code{pop-up-frames} is non-@code{nil}, it searches all frames on the current terminal. @xref{Choosing Window Options}. @@ -1769,14 +1768,6 @@ The behavior of the standard display actions of @code{display-buffer} (@pxref{Choosing Window}) can be modified by a variety of user options. -@defopt display-buffer-reuse-frames -If the value of this variable is non-@code{nil}, @code{display-buffer} -may search all frames on the current terminal when looking for a -window already displaying the specified buffer. The default is -@code{nil}. This variable is consulted by the action function -@code{display-buffer-reuse-window} (@pxref{Display Action Functions}). -@end defopt - @defopt pop-up-windows If the value of this variable is non-@code{nil}, @code{display-buffer} is allowed to split an existing window to make a new window for diff --git a/etc/NEWS b/etc/NEWS index b85d64f83a3..55b8388ca27 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -671,7 +671,7 @@ specifies frame parameters to give any newly-created frame. *** The following variables are obsolete, as they can be replaced by appropriate entries in the `display-buffer-alist' function introduced in Emacs 24.1: - ++++ **** `display-buffer-reuse-frames' **** `special-display-regexps' **** `special-display-frame-alist' -- 2.11.4.GIT