[Emacs-diffs] emacs-25 625a5df: Document the new bindings of <UP> and <DOWN> in the minibuffer

[Eli Zaretskii]

branch: emacs-25
commit 625a5df83414b49a82da8cc47a91aa1758fd71d4
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Document the new bindings of <UP> and <DOWN> in the minibuffer
    
    * doc/emacs/mini.texi (Minibuffer History): Describe the new
    bindings of <UP> and <DOWN> in the minibuffer.
---
 doc/emacs/mini.texi |   30 +++++++++++++++++++++---------
 etc/NEWS            |   12 ++++++++----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index ed339a9..869e064 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -588,13 +588,17 @@ argument into the minibuffer:
 
 @table @kbd
 @item M-p
address@hidden @key{UP}
 Move to the previous item in the minibuffer history, an earlier
 argument (@code{previous-history-element}).
 @item M-n
address@hidden @key{DOWN}
 Move to the next item in the minibuffer history
 (@code{next-history-element}).
address@hidden @key{UP}
address@hidden @key{DOWN}
+Like @kbd{M-p} and @kbd{M-n}, but move to the previous or next line of
+a multi-line item before going to the previous history item
+(@code{previous-line-or-history-element} and
address@hidden) .
 @item M-r @var{regexp} @key{RET}
 Move to an earlier item in the minibuffer history that
 matches @var{regexp} (@code{previous-matching-history-element}).
@@ -609,13 +613,13 @@ Move to a later item in the minibuffer history that 
matches
 @kindex DOWN @r{(minibuffer history)}
 @findex next-history-element
 @findex previous-history-element
-  While in the minibuffer, @kbd{M-p} or @key{UP}
-(@code{previous-history-element}) moves through the minibuffer history
-list, one item at a time.  Each @kbd{M-p} fetches an earlier item from
-the history list into the minibuffer, replacing its existing contents.
-Typing @kbd{M-n} or @key{DOWN} (@code{next-history-element}) moves
-through the minibuffer history list in the opposite direction,
-fetching later entries into the minibuffer.
+  While in the minibuffer, @kbd{M-p} (@code{previous-history-element})
+moves through the minibuffer history list, one item at a time.  Each
address@hidden fetches an earlier item from the history list into the
+minibuffer, replacing its existing contents.  Typing @kbd{M-n}
+(@code{next-history-element}) moves through the minibuffer history
+list in the opposite direction, fetching later entries into the
+minibuffer.
 
   If you type @kbd{M-n} in the minibuffer when there are no later
 entries in the minibuffer history (e.g., if you haven't previously
@@ -623,6 +627,14 @@ typed @kbd{M-p}), Emacs tries fetching from a list of 
default
 arguments: values that you are likely to enter.  You can think of this
 as moving through the ``future history''.
 
address@hidden previous-line-or-history-element
address@hidden next-line-or-history-element
+  The arrow keys @address@hidden and @address@hidden work like
address@hidden and @kbd{M-n}, but if the current history item is longer
+than a single line, they allow you to move to the previous or next
+line of the current history item before going to the previous or next
+history item.
+
   If you edit the text inserted by the @kbd{M-p} or @kbd{M-n}
 minibuffer history commands, this does not change its entry in the
 history list.  However, the edited argument does go at the end of the
diff --git a/etc/NEWS b/etc/NEWS
index 383b491..d65e9dd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -492,11 +492,15 @@ match the current input.
 
 ** Minibuffer
 
-*** You can use <up> and <down> keys to move point in the multi-line
-minibuffer just as in an ordinary buffer.  Only when point moves over
++++
+*** You can use <UP> and <DOWN> arrow keys to move through history by lines.
+The new commands `next-line-or-history-element' and
+`previous-line-or-history-element', bound to <UP> and <DOWN> in the
+minibuffer, allow by-line movement through minibuffer history,
+similarly to an ordinary buffer.  Only when point moves over
 the bottom/top of the minibuffer it goes to the next/previous history
-element.  The new commands bound to <up> and <down> in the minibuffer:
-`next-line-or-history-element' and `previous-line-or-history-element'.
+element.  `M-p' and `M-n' still move directly to previous/next history
+item as before.
 
 ** Search and Replace