summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-05-04 19:49:19 -0700
committerGlenn Morris <rgm@gnu.org>2012-05-04 19:49:19 -0700
commite68b393e6078ffad1e026a8c9de41a472eebc488 (patch)
tree819a1f628d5dac039d467289c5db47ad84637da3
parent3e1a3a0035ec36f37e59da1d31002dbe9c6f2a1a (diff)
downloademacs-e68b393e6078ffad1e026a8c9de41a472eebc488.tar.gz
* minibuf.texi (Minibuffer History, Basic Completion): Tweak page breaks.
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/minibuf.texi9
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5bb5d6101e4..186558be254 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
2012-05-05 Glenn Morris <rgm@gnu.org>
+ * minibuf.texi (Minibuffer History, Basic Completion):
+ Tweak page breaks.
+
* internals.texi (Garbage Collection, Memory Usage)
(Writing Emacs Primitives): Tweak page breaks.
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 47ecc9e5893..e40cbd14687 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -513,8 +513,7 @@ duplicates, and to add @var{newelt} to the list even if it is empty.
If the value of this variable is @code{nil}, standard functions that
read from the minibuffer don't add new elements to the history list.
This lets Lisp programs explicitly manage input history by using
-@code{add-to-history}. By default, @code{history-add-new-input} is
-non-@code{nil}.
+@code{add-to-history}. The default value is @code{t}.
@end defvar
@defopt history-length
@@ -697,7 +696,7 @@ You can also use a function as @var{collection}. Then the function is
solely responsible for performing completion; @code{try-completion}
returns whatever this function returns. The function is called with
three arguments: @var{string}, @var{predicate} and @code{nil} (the
-reason for the third argument is so that the same function can be used
+third argument is so that the same function can be used
in @code{all-completions} and do the appropriate thing in either
case). @xref{Programmed Completion}.
@@ -720,8 +719,8 @@ handle @code{completion-regexp-list} itself.)
In the first of the following examples, the string @samp{foo} is
matched by three of the alist @sc{car}s. All of the matches begin with
the characters @samp{fooba}, so that is the result. In the second
-example, there is only one possible match, and it is exact, so the value
-is @code{t}.
+example, there is only one possible match, and it is exact, so the
+return value is @code{t}.
@smallexample
@group