From: Glenn Morris <rgm@gnu.org>
Date: Fri, 16 Apr 2021 14:50:20 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~2837
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=629e5f8026c7007a928ff1ccc987d1d3059d2a7f;p=emacs.git

Merge from origin/emacs-27

eedad01b4b (origin/emacs-27) Fix typos in manuals
24d214652e Fix description of momentary message display
---

629e5f8026c7007a928ff1ccc987d1d3059d2a7f
diff --cc doc/emacs/mini.texi
index d0865c5d0bd,5d629e1c101..1eba7074f76
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@@ -64,28 -64,11 +64,28 @@@ minibuffer-electric-default-mode}
  
    Since the minibuffer appears in the echo area, it can conflict with
  other uses of the echo area.  If an error message or an informative
- message is emitted while the minibuffer is active, the message hides
- the minibuffer for a few seconds, or until you type something; then
- the minibuffer comes back.  While the minibuffer is in use, Emacs does
- not echo keystrokes.
+ message is emitted while the minibuffer is active, the message is
+ displayed in brackets after the minibuffer text for a few seconds, or
+ until you type something; then the message disappears.  While the
+ minibuffer is in use, Emacs does not echo keystrokes.
  
 +@vindex minibuffer-follows-selected-frame
 +  While using the minibuffer, you can switch to a different frame,
 +perhaps to note text you need to enter (@pxref{Frame Commands}).  By
 +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.  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.  The sole
 +exception is that when that frame no longer exists, the action takes
 +place in the currently selected frame.
 +
  @node Minibuffer File
  @section Minibuffers for File Names