masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 12:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor copyedits of documentation for temporary displays

Browse source 
* doc/emacs/windows.texi (Temporary Displays): Improve indexing.
Minor changes in wording.
(Window Choice, Displaying Buffers, Pop Up Window): Disambiguate
index entries for 'display-buffer'.

* etc/NEWS: Minor rewording of the entry about temporary displays.
This commit is contained in:
Eli Zaretskii 2016-03-25 13:37:58 +03:00
parent 90fb9b38dd
commit 422c3dadce
2 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
doc/emacs/windows.texi
View file

@ -206,7 +206,7 @@ Choice}, for how Emacs picks or creates the window to use.
Select buffer @var{bufname} in another window Select buffer @var{bufname} in another window
(@code{switch-to-buffer-other-window}). (@code{switch-to-buffer-other-window}).
@findex display-buffer @findex display-buffer @r{(command)}
@item C-x 4 C-o @var{bufname} @key{RET} @item C-x 4 C-o @var{bufname} @key{RET}
@kindex C-x 4 C-o @kindex C-x 4 C-o
Display buffer @var{bufname} in some window, without trying to select Display buffer @var{bufname} in some window, without trying to select
@ -345,7 +345,6 @@ user's attention will be diverted to that buffer. These commands
usually work by calling @code{switch-to-buffer} internally usually work by calling @code{switch-to-buffer} internally
(@pxref{Select Buffer}). (@pxref{Select Buffer}).
@findex display-buffer
Some commands try to display intelligently, trying not to take Some commands try to display intelligently, trying not to take
over the selected window, e.g., by splitting off a new window and over the selected window, e.g., by splitting off a new window and
displaying the desired buffer there. Such commands, which include the displaying the desired buffer there. Such commands, which include the
@ -379,7 +378,7 @@ Several of these commands are bound in the @kbd{C-x 5} prefix key.
@node Window Choice @node Window Choice
@subsection How @code{display-buffer} works @subsection How @code{display-buffer} works
@findex display-buffer @findex display-buffer, detailed description
The @code{display-buffer} command (as well as commands that call it The @code{display-buffer} command (as well as commands that call it
internally) chooses a window to display by following the steps given internally) chooses a window to display by following the steps given
@ -449,6 +448,8 @@ mentioned in the next section.
@node Temporary Displays @node Temporary Displays
@subsection Displaying non-editable buffers. @subsection Displaying non-editable buffers.
@cindex pop-up windows
@cindex temporary windows
Some buffers are shown in windows for perusal rather than for editing. Some buffers are shown in windows for perusal rather than for editing.
Help commands (@pxref{Help}) typically use a buffer called @file{*Help*} Help commands (@pxref{Help}) typically use a buffer called @file{*Help*}
@ -458,17 +459,17 @@ displayed only for a short period of time.
Normally, Emacs chooses the window for such temporary displays via Normally, Emacs chooses the window for such temporary displays via
@code{display-buffer} as described above. The @file{*Completions*} @code{display-buffer} as described above. The @file{*Completions*}
buffer, on the other hand, is preferably displayed in a window at the buffer, on the other hand, is normally displayed in a window at the
bottom of the selected frame, regardless of the number of windows bottom of the selected frame, regardless of the number of windows
already shown on that frame. already shown on that frame.
If you prefer Emacs to display a temporary buffer in a different If you prefer Emacs to display a temporary buffer in a different
fashion, the recommended approach is to customize the variable fashion, we recommend to customize the variable
@code{display-buffer-alist} (@pxref{Choosing Window,,Choosing a Window @code{display-buffer-alist} (@pxref{Choosing Window,,Choosing a Window
for Display, elisp, The Emacs Lisp Reference Manual}). For example, to for Display, elisp, The Emacs Lisp Reference Manual}). For example,
display @file{*Completions*} by splitting a window as described in the to display @file{*Completions*} by splitting a window as described in
previous section, use the following form in your initialization file the previous section, use the following form in your initialization
(@pxref{Init File}): file (@pxref{Init File}):
@example @example
@group @group
@ -478,14 +479,17 @@ previous section, use the following form in your initialization file
@end group @end group
@end example @end example
@findex temp-buffer-resize-mode
The @file{*Completions*} buffer is also special in the sense that The @file{*Completions*} buffer is also special in the sense that
Emacs usually tries to make its window just as large as to display all Emacs usually tries to make its window just as large as necessary to
of its contents. To resize windows showing other temporary displays display all of its contents. To resize windows showing other
like, for example, the @file{*Help*} buffer accordingly, you have to temporary displays like, for example, the @file{*Help*} buffer
explicitly invoke the minor mode (@pxref{Minor Modes}) accordingly, turn on the minor mode (@pxref{Minor Modes})
@code{temp-buffer-resize-mode} (@pxref{Temporary Displays,,Temporary @code{temp-buffer-resize-mode} (@pxref{Temporary Displays,,Temporary
Displays, elisp, The Emacs Lisp Reference Manual}). Displays, elisp, The Emacs Lisp Reference Manual}).
@vindex temp-buffer-max-height
@vindex temp-buffer-max-width
The maximum size of windows resized by @code{temp-buffer-resize-mode} The maximum size of windows resized by @code{temp-buffer-resize-mode}
can be controlled by customizing the options can be controlled by customizing the options
@code{temp-buffer-max-height} and @code{temp-buffer-max-width} @code{temp-buffer-max-height} and @code{temp-buffer-max-width}

10
etc/NEWS
View file

@ -1927,10 +1927,14 @@ frames.
and 'window-divider-default-right-width'. and 'window-divider-default-right-width'.
+++ +++
*** The minibuffer completions window is now displayad at the bottom of *** The window displaying the '*Completions*' buffer with minibuffer
the selected frame and always fit to its buffer. The Emacs manual completion candidates is now shown at the bottom of the selected
frame. The size of that window is always as large as required to
display all the candidates, except when limited by the minimum size
of the other windows on that frame; those other windows are resized
to provide space for the '*Completions*' display. The Emacs manual
describes how to customize 'display-buffer-alist' to get back the old describes how to customize 'display-buffer-alist' to get back the old
behavior. behavior, see the node "Temporary Displays" there.
--- ---
** Tearoff menus and detachable toolbars for Gtk+ have been removed. ** Tearoff menus and detachable toolbars for Gtk+ have been removed.