aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-11-09 11:43:19 +0200
committerEli Zaretskii2019-11-09 11:43:19 +0200
commit4e4440272ece6d698d88af680d5c17ab322c7b64 (patch)
treea41af9fa63603ff856fa6638c2573aaeb927f65c
parent15f4c4156c1a0afdedbe6f13732431383f44f36f (diff)
downloademacs-4e4440272ece6d698d88af680d5c17ab322c7b64.tar.gz
emacs-4e4440272ece6d698d88af680d5c17ab322c7b64.zip
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)
-rw-r--r--doc/lispref/minibuf.texi4
-rw-r--r--lisp/simple.el6
2 files changed, 6 insertions, 4 deletions
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}
141reads the text and returns the resulting Lisp object, unevaluated. 141reads the text and returns the resulting Lisp object, unevaluated.
142(@xref{Input Functions}, for information about reading.) 142(@xref{Input Functions}, for information about reading.)
143 143
144@cindex future history in minibuffer input
144The argument @var{default} specifies default values to make available 145The argument @var{default} specifies default values to make available
145through the history commands. It should be a string, a list of 146through the history commands. It should be a string, a list of
146strings, or @code{nil}. The string or strings become the minibuffer's 147strings, 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
2308@deffn Command next-history-element n 2309@deffn Command next-history-element n
2309This command replaces the minibuffer contents with the value of the 2310This command replaces the minibuffer contents with the value of the
2310@var{n}th more recent history element. The position in the history 2311@var{n}th more recent history element. The position in the history
2311can go beyond the current position and invoke ``future history.'' 2312can go beyond the current position and invoke ``future history''
2313(@pxref{Text from Minibuffer}).
2312@end deffn 2314@end deffn
2313 2315
2314@deffn Command previous-matching-history-element pattern n 2316@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."
2131The argument NABS specifies the absolute history position in 2131The argument NABS specifies the absolute history position in
2132descending order, where 0 means the current element and a 2132descending order, where 0 means the current element and a
2133positive number N means the Nth previous element. NABS being a 2133positive number N means the Nth previous element. NABS being a
2134negative number -N means the Nth entry of ``future history.''" 2134negative number -N means the Nth entry of \"future history.\""
2135 (interactive "p") 2135 (interactive "p")
2136 (when (and (not minibuffer-default-add-done) 2136 (when (and (not minibuffer-default-add-done)
2137 (functionp minibuffer-default-add-function) 2137 (functionp minibuffer-default-add-function)
@@ -2189,8 +2189,8 @@ negative number -N means the Nth entry of ``future history.''"
2189(defun next-history-element (n) 2189(defun next-history-element (n)
2190 "Puts next element of the minibuffer history in the minibuffer. 2190 "Puts next element of the minibuffer history in the minibuffer.
2191With argument N, it uses the Nth following element. The position 2191With argument N, it uses the Nth following element. The position
2192in the history can go beyond the current position and invoke 2192in the history can go beyond the current position and invoke \"future
2193``future history.''" 2193history.\""
2194 (interactive "p") 2194 (interactive "p")
2195 (or (zerop n) 2195 (or (zerop n)
2196 (goto-history-element (- minibuffer-history-position n)))) 2196 (goto-history-element (- minibuffer-history-position n))))