From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 Nov 2019 09:43:19 +0000 (+0200)
Subject: Fix last change
X-Git-Tag: emacs-27.0.90~692
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e4440272ece6d698d88af680d5c17ab322c7b64;p=emacs.git

Fix last change

* lisp/simple.el (goto-history-element)
(next-history-element): Fix quoting of "future history".

* doc/lispref/minibuf.texi (Minibuffer Commands)
(Text from Minibuffer): Add index entry and cross-reference
for "future history".  (Bug#38026)
---

diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index b5798a9c174..49add3f7a79 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -141,6 +141,7 @@ However, if @var{read} is non-@code{nil}, @code{read-from-minibuffer}
 reads the text and returns the resulting Lisp object, unevaluated.
 (@xref{Input Functions}, for information about reading.)
 
+@cindex future history in minibuffer input
 The argument @var{default} specifies default values to make available
 through the history commands.  It should be a string, a list of
 strings, or @code{nil}.  The string or strings become the minibuffer's
@@ -2308,7 +2309,8 @@ This command replaces the minibuffer contents with the value of the
 @deffn Command next-history-element n
 This command replaces the minibuffer contents with the value of the
 @var{n}th more recent history element.  The position in the history
-can go beyond the current position and invoke ``future history.''
+can go beyond the current position and invoke ``future history''
+(@pxref{Text from Minibuffer}).
 @end deffn
 
 @deffn Command previous-matching-history-element pattern n
diff --git a/lisp/simple.el b/lisp/simple.el
index b7a601b2e2d..6677291ebab 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2131,7 +2131,7 @@ the end of the list of defaults just after the default value."
 The argument NABS specifies the absolute history position in
 descending order, where 0 means the current element and a
 positive number N means the Nth previous element.  NABS being a
-negative number -N means the Nth entry of ``future history.''"
+negative number -N means the Nth entry of \"future history.\""
   (interactive "p")
   (when (and (not minibuffer-default-add-done)
 	     (functionp minibuffer-default-add-function)
@@ -2189,8 +2189,8 @@ negative number -N means the Nth entry of ``future history.''"
 (defun next-history-element (n)
   "Puts next element of the minibuffer history in the minibuffer.
 With argument N, it uses the Nth following element.  The position
-in the history can go beyond the current position and invoke
-``future history.''"
+in the history can go beyond the current position and invoke \"future
+history.\""
   (interactive "p")
   (or (zerop n)
       (goto-history-element (- minibuffer-history-position n))))