procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26

Browse source
This commit is contained in:
Eli Zaretskii 2017-10-30 20:47:06 +02:00
commit ee493663ba
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
doc/lispref/minibuf.texi
View file

@ -59,15 +59,16 @@ boundary between the prompt and the actual text.
@c See https://debbugs.gnu.org/11276 @c See https://debbugs.gnu.org/11276
The minibuffer's window is normally a single line; it grows The minibuffer's window is normally a single line; it grows
automatically if the contents require more space. Whilst it is automatically if the contents require more space. Whilst the minibuffer
active, you can explicitly resize it temporarily with the window is active, you can explicitly resize its window temporarily with the
sizing commands; it reverts to its normal size when the minibuffer is window sizing commands; the window reverts to its normal size when the
exited. When the minibuffer is not active, you can resize it minibuffer is exited. When the minibuffer is not active, you can resize
permanently by using the window sizing commands in the frame's other its window permanently by using the window sizing commands in the
window, or dragging the mode line with the mouse. (Due to details of frame's other window, or dragging the mode line with the mouse. (Due to
the current implementation, for this to work @code{resize-mini-windows} details of the current implementation, for this to work
must be @code{nil}.) If the frame contains just a minibuffer, you can @code{resize-mini-windows} must be @code{nil}.) If the frame contains
change the minibuffer's size by changing the frame's size. just a minibuffer window, you can change its size by changing the
frame's size.
Use of the minibuffer reads input events, and that alters the values Use of the minibuffer reads input events, and that alters the values
of variables such as @code{this-command} and @code{last-command} of variables such as @code{this-command} and @code{last-command}
@ -2286,18 +2287,18 @@ The following function returns the window showing the currently active
minibuffer. minibuffer.
@defun active-minibuffer-window @defun active-minibuffer-window
This function returns the currently active minibuffer window, or This function returns the window of the currently active minibuffer, or
@code{nil} if there is none. @code{nil} if there is no active minibuffer.
@end defun @end defun
It is not sufficient to determine whether a given window is the It is not sufficient to determine whether a given window shows the
currently active minibuffer window by comparing it with the result of currently active minibuffer by comparing it with the result of
@code{(minibuffer-window)}, because there can be more than one @code{(minibuffer-window)}, because there can be more than one
minibuffer window if there is more than one frame. minibuffer window if there is more than one frame.
@defun minibuffer-window-active-p window @defun minibuffer-window-active-p window
This function returns non-@code{nil} if @var{window} is the currently This function returns non-@code{nil} if @var{window} shows the currently
active minibuffer window. active minibuffer.
@end defun @end defun
The following two options control whether minibuffer windows are resized The following two options control whether minibuffer windows are resized
@ -2379,14 +2380,14 @@ returns zero.
@defopt enable-recursive-minibuffers @defopt enable-recursive-minibuffers
If this variable is non-@code{nil}, you can invoke commands (such as If this variable is non-@code{nil}, you can invoke commands (such as
@code{find-file}) that use minibuffers even while the minibuffer window @code{find-file}) that use minibuffers even while the minibuffer is
is active. Such invocation produces a recursive editing level for a new active. Such invocation produces a recursive editing level for a new
minibuffer. The outer-level minibuffer is invisible while you are minibuffer. The outer-level minibuffer is invisible while you are
editing the inner one. editing the inner one.
If this variable is @code{nil}, you cannot invoke minibuffer If this variable is @code{nil}, you cannot invoke minibuffer commands
commands when the minibuffer window is active, not even if you switch to when the minibuffer is active, not even if you switch to another window
another window to do it. to do it.
@end defopt @end defopt
@c Emacs 19 feature @c Emacs 19 feature
@ -2444,8 +2445,8 @@ minibuffer, it scrolls this window.
@end defvar @end defvar
@defun minibuffer-selected-window @defun minibuffer-selected-window
This function returns the window that was selected at the moment the This function returns the window that was selected just before the
minibuffer was entered. If the currently selected window is not a minibuffer window was selected. If the selected window is not a
minibuffer window, it returns @code{nil}. minibuffer window, it returns @code{nil}.
@end defun @end defun

2
src/window.c
View file

@ -5832,7 +5832,7 @@ by this function. This happens in an interactive call. */)
} }
DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0, DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0,
doc: /* Return the window which was selected when entering the minibuffer. doc: /* Return window selected just before minibuffer window was selected.
Return nil if the selected window is not a minibuffer window. */) Return nil if the selected window is not a minibuffer window. */)
(void) (void)
{ {