(Choosing Window, Displaying Buffers): Fix last changes.

This commit is contained in:
Eli Zaretskii 2008-10-18 20:23:30 +00:00
parent 2ee797be40
commit da86d54b4c

View file

@ -895,16 +895,16 @@ unless @var{norecord} is non-@code{nil}.
@end defun
@deffn Command replace-buffer-in-windows buffer-or-name
This function replaces @var{buffer-or-name} with some other buffer in
all windows displaying it. It chooses the other buffer with
@code{other-buffer}. In the usual applications of this function, you
This function replaces @var{buffer-or-name} in all windows displaying
it with some other buffer. It uses @code{other-buffer} to choose the
other buffer. In the usual applications of this function, you
don't care which other buffer is used; you just want to make sure that
@var{buffer-or-name} is no longer displayed.
If a window displaying @var{buffer-or-name} is dedicated and the window
is not the only window on its frame, that window is deleted. If the
If the window displaying @var{buffer-or-name} is dedicated, and
is not the only window on its frame, that window is deleted. If that
window is the only window on its frame and there are other frames left,
the window's frame is deleted too. If there are no other frames left,
the window's frame is deleted as well. If there are no other frames left,
some other buffer is displayed in that window.
This function returns @code{nil}.
@ -1184,19 +1184,19 @@ described above.
@c Emacs 19 feature
@cindex dedicated window
A window can be marked as ``dedicated'' to its buffer. Then
A window can be marked as @dfn{dedicated} to its buffer. Then
@code{display-buffer} will not try to use that window to display any
other buffer. @code{set-window-buffer} will throw an error when asked
to display another buffer in it. Both, @code{get-lru-window} and
other buffer. @code{set-window-buffer} will signal an error when asked
to display another buffer in it. Both @code{get-lru-window} and
@code{get-largest-window} do not consider dedicated windows as
candidates when their @var{dedicated} argument is non-@code{nil}.
When @code{delete-windows-on} deletes a dedicated window and that window
is the only window on its frame, it will delete that frame as well when
is the only window on its frame, it will delete that frame as well if
there are other frames left. @code{replace-buffer-in-windows} deletes
any dedicated window showing its buffer argument. When such a window is
the only window on its frame, that frame is deleted too when there are
other frames left.
the only window on its frame, that frame is deleted if there are other
frames left.
@defun window-dedicated-p &optional window
This function returns non-@code{nil} if @var{window} is marked as