diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/mini.texi | 10 | ||||
-rw-r--r-- | doc/emacs/trouble.texi | 7 | ||||
-rw-r--r-- | doc/lispref/minibuf.texi | 24 |
3 files changed, 29 insertions, 12 deletions
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index c7c8fb30ac6..f81e64bdf9b 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -76,9 +76,13 @@ default, the active minibuffer moves to this new frame. If you set the user option @code{minibuffer-follows-selected-frame} to @code{nil}, then the minibuffer stays in the frame where you opened it, and you must switch back to that frame in order to complete (or -abort) the current command. Note that the effect of the command, when -you finally finish using the minibuffer, always takes place in the -frame where you first opened it. +abort) the current command. If you set that option to a value which +is neither @code{nil} nor @code{t}, the minibuffer moves frame only +after a recursive minibuffer has been opened in the current command +(@pxref{Recursive Mini,,, elisp}). This option is mainly to retain +(approximately) the behavior prior to Emacs 28.1. Note that the +effect of the command, when you finally finish using the minibuffer, +always takes place in the frame where you first opened it. @node Minibuffer File @section Minibuffers for File Names diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 4da3d4a3e89..9a638818c91 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -57,6 +57,13 @@ incremental search, @kbd{C-g} behaves specially; it may take two successive @kbd{C-g} characters to get out of a search. @xref{Incremental Search}, for details. + If you type @kbd{C-g} in a minibuffer, this quits the command that +opened that minibuffer, closing it. If that minibuffer is not the +most recently opened one (which can happen when +@code{minibuffer-follows-selected-frame} is @code{nil} (@pxref{Basic +Minibuffer})), @kbd{C-g} also closes the more recently opened ones, +quitting their associated commands, after asking you for confirmation. + On MS-DOS, the character @kbd{C-@key{Break}} serves as a quit character like @kbd{C-g}. The reason is that it is not feasible, on MS-DOS, to recognize @kbd{C-g} while a command is running, between interactions diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index f0036f0ccfc..d316c1f0602 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -82,10 +82,12 @@ there is an active minibuffer; such a minibuffer is called a incrementing the number at the end of the name. (The names begin with a space so that they won't show up in normal buffer lists.) Of several recursive minibuffers, the innermost (or most recently -entered) is the active minibuffer. We usually call this @emph{the} -minibuffer. You can permit or forbid recursive minibuffers by setting -the variable @code{enable-recursive-minibuffers}, or by putting -properties of that name on command symbols (@xref{Recursive Mini}.) +entered) is the @dfn{active minibuffer}--it is the one you can +terminate by typing @key{RET} (@code{exit-minibuffer}) in. We usually +call this @emph{the} minibuffer. You can permit or forbid recursive +minibuffers by setting the variable +@code{enable-recursive-minibuffers}, or by putting properties of that +name on command symbols (@xref{Recursive Mini}.) Like other buffers, a minibuffer uses a local keymap (@pxref{Keymaps}) to specify special key bindings. The function that @@ -2380,7 +2382,8 @@ minibuffer. @deffn Command exit-minibuffer This command exits the active minibuffer. It is normally bound to -keys in minibuffer local keymaps. +keys in minibuffer local keymaps. The command throws an error if the +current buffer is not the active minibuffer. @end deffn @deffn Command self-insert-and-exit @@ -2594,8 +2597,11 @@ returns zero. If this variable is non-@code{nil}, you can invoke commands (such as @code{find-file}) that use minibuffers even while the minibuffer is active. Such invocation produces a recursive editing level for a new -minibuffer. The outer-level minibuffer is invisible while you are -editing the inner one. +minibuffer. By default, the outer-level minibuffer is invisible while +you are editing the inner one. If you have +@code{minibuffer-follows-selected-frame} set to @code{nil}, you can +have minibuffers visible on several frames at the same time. +@xref{Basic Minibuffer,,, emacs}. If this variable is @code{nil}, you cannot invoke minibuffer commands when the minibuffer is active, not even if you switch to another window @@ -2623,7 +2629,7 @@ active minibuffer. @end defun @defvar minibuffer-setup-hook -This is a normal hook that is run whenever the minibuffer is entered. +This is a normal hook that is run whenever a minibuffer is entered. @xref{Hooks}. @end defvar @@ -2641,7 +2647,7 @@ called once, for the outermost use of the minibuffer. @end defmac @defvar minibuffer-exit-hook -This is a normal hook that is run whenever the minibuffer is exited. +This is a normal hook that is run whenever a minibuffer is exited. @xref{Hooks}. @end defvar |