diff options
| author | Chong Yidong | 2012-09-07 18:27:11 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-09-07 18:27:11 +0800 |
| commit | 14ba4cf3b27a32bb1a583510121ac0be44bbff3c (patch) | |
| tree | ab6e0668efd54fc8f207d822481674607e0d6a8b | |
| parent | 145823ecb2d55a7ea33d4a8482b5941f189d9418 (diff) | |
| download | emacs-14ba4cf3b27a32bb1a583510121ac0be44bbff3c.tar.gz emacs-14ba4cf3b27a32bb1a583510121ac0be44bbff3c.zip | |
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.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/windows.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 11 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-09-07 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * windows.texi (Window Choice): Don't mention obsolete | ||
| 4 | display-buffer-reuse-frames. | ||
| 5 | |||
| 1 | 2012-09-04 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-09-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Give more-useful info on a fatal error (Bug#12328). | 8 | 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 | |||
| 378 | expression to the list @code{same-window-regexps}. By default, these | 378 | expression to the list @code{same-window-regexps}. By default, these |
| 379 | variables are @code{nil}, so this step is skipped. | 379 | variables are @code{nil}, so this step is skipped. |
| 380 | 380 | ||
| 381 | @vindex display-buffer-reuse-frames | ||
| 382 | @item | 381 | @item |
| 383 | Otherwise, if the buffer is already displayed in an existing window, | 382 | Otherwise, if the buffer is already displayed in an existing window, |
| 384 | ``reuse'' that window. Normally, only windows on the selected frame | 383 | ``reuse'' that window. Normally, only windows on the selected frame |
| 385 | are considered, but windows on other frames are also reusable if you | 384 | are considered, but windows on other frames are also reusable if you |
| 386 | change @code{display-buffer-reuse-frames} to @code{t}, or if you | ||
| 387 | change @code{pop-up-frames} (see below) to @code{t}. | 385 | change @code{pop-up-frames} (see below) to @code{t}. |
| 388 | 386 | ||
| 389 | @item | 387 | @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 @@ | |||
| 1 | 2012-09-07 Chong Yidong <cyd@gnu.org> | 1 | 2012-09-07 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * windows.texi (Display Action Functions) | ||
| 4 | (Choosing Window Options): Remove obsolete variable | ||
| 5 | display-buffer-reuse-frames. | ||
| 6 | |||
| 3 | * positions.texi (Narrowing): Document buffer-narrowed-p. | 7 | * positions.texi (Narrowing): Document buffer-narrowed-p. |
| 4 | 8 | ||
| 5 | * markers.texi (Moving Markers): Add xref to Point (Bug#7151). | 9 | * 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. | |||
| 1728 | @end itemize | 1728 | @end itemize |
| 1729 | 1729 | ||
| 1730 | If @var{alist} contains no @code{reusable-frames} entry, this function | 1730 | If @var{alist} contains no @code{reusable-frames} entry, this function |
| 1731 | normally searches just the selected frame; however, if either the | 1731 | normally searches just the selected frame; however, if the variable |
| 1732 | variable @code{display-buffer-reuse-frames} or the variable | ||
| 1733 | @code{pop-up-frames} is non-@code{nil}, it searches all frames on the | 1732 | @code{pop-up-frames} is non-@code{nil}, it searches all frames on the |
| 1734 | current terminal. @xref{Choosing Window Options}. | 1733 | current terminal. @xref{Choosing Window Options}. |
| 1735 | 1734 | ||
| @@ -1769,14 +1768,6 @@ The behavior of the standard display actions of @code{display-buffer} | |||
| 1769 | (@pxref{Choosing Window}) can be modified by a variety of user | 1768 | (@pxref{Choosing Window}) can be modified by a variety of user |
| 1770 | options. | 1769 | options. |
| 1771 | 1770 | ||
| 1772 | @defopt display-buffer-reuse-frames | ||
| 1773 | If the value of this variable is non-@code{nil}, @code{display-buffer} | ||
| 1774 | may search all frames on the current terminal when looking for a | ||
| 1775 | window already displaying the specified buffer. The default is | ||
| 1776 | @code{nil}. This variable is consulted by the action function | ||
| 1777 | @code{display-buffer-reuse-window} (@pxref{Display Action Functions}). | ||
| 1778 | @end defopt | ||
| 1779 | |||
| 1780 | @defopt pop-up-windows | 1771 | @defopt pop-up-windows |
| 1781 | If the value of this variable is non-@code{nil}, @code{display-buffer} | 1772 | If the value of this variable is non-@code{nil}, @code{display-buffer} |
| 1782 | is allowed to split an existing window to make a new window for | 1773 | is allowed to split an existing window to make a new window for |
| @@ -671,7 +671,7 @@ specifies frame parameters to give any newly-created frame. | |||
| 671 | *** The following variables are obsolete, as they can be replaced by | 671 | *** The following variables are obsolete, as they can be replaced by |
| 672 | appropriate entries in the `display-buffer-alist' function introduced | 672 | appropriate entries in the `display-buffer-alist' function introduced |
| 673 | in Emacs 24.1: | 673 | in Emacs 24.1: |
| 674 | 674 | +++ | |
| 675 | **** `display-buffer-reuse-frames' | 675 | **** `display-buffer-reuse-frames' |
| 676 | **** `special-display-regexps' | 676 | **** `special-display-regexps' |
| 677 | **** `special-display-frame-alist' | 677 | **** `special-display-frame-alist' |