aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-04 19:49:19 -0700
committerGlenn Morris2012-05-04 19:49:19 -0700
commite68b393e6078ffad1e026a8c9de41a472eebc488 (patch)
tree819a1f628d5dac039d467289c5db47ad84637da3
parent3e1a3a0035ec36f37e59da1d31002dbe9c6f2a1a (diff)
downloademacs-e68b393e6078ffad1e026a8c9de41a472eebc488.tar.gz
emacs-e68b393e6078ffad1e026a8c9de41a472eebc488.zip
* 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 @@
12012-05-05 Glenn Morris <rgm@gnu.org> 12012-05-05 Glenn Morris <rgm@gnu.org>
2 2
3 * minibuf.texi (Minibuffer History, Basic Completion):
4 Tweak page breaks.
5
3 * internals.texi (Garbage Collection, Memory Usage) 6 * internals.texi (Garbage Collection, Memory Usage)
4 (Writing Emacs Primitives): Tweak page breaks. 7 (Writing Emacs Primitives): Tweak page breaks.
5 8
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.
513If the value of this variable is @code{nil}, standard functions that 513If the value of this variable is @code{nil}, standard functions that
514read from the minibuffer don't add new elements to the history list. 514read from the minibuffer don't add new elements to the history list.
515This lets Lisp programs explicitly manage input history by using 515This lets Lisp programs explicitly manage input history by using
516@code{add-to-history}. By default, @code{history-add-new-input} is 516@code{add-to-history}. The default value is @code{t}.
517non-@code{nil}.
518@end defvar 517@end defvar
519 518
520@defopt history-length 519@defopt history-length
@@ -697,7 +696,7 @@ You can also use a function as @var{collection}. Then the function is
697solely responsible for performing completion; @code{try-completion} 696solely responsible for performing completion; @code{try-completion}
698returns whatever this function returns. The function is called with 697returns whatever this function returns. The function is called with
699three arguments: @var{string}, @var{predicate} and @code{nil} (the 698three arguments: @var{string}, @var{predicate} and @code{nil} (the
700reason for the third argument is so that the same function can be used 699third argument is so that the same function can be used
701in @code{all-completions} and do the appropriate thing in either 700in @code{all-completions} and do the appropriate thing in either
702case). @xref{Programmed Completion}. 701case). @xref{Programmed Completion}.
703 702
@@ -720,8 +719,8 @@ handle @code{completion-regexp-list} itself.)
720In the first of the following examples, the string @samp{foo} is 719In the first of the following examples, the string @samp{foo} is
721matched by three of the alist @sc{car}s. All of the matches begin with 720matched by three of the alist @sc{car}s. All of the matches begin with
722the characters @samp{fooba}, so that is the result. In the second 721the characters @samp{fooba}, so that is the result. In the second
723example, there is only one possible match, and it is exact, so the value 722example, there is only one possible match, and it is exact, so the
724is @code{t}. 723return value is @code{t}.
725 724
726@smallexample 725@smallexample
727@group 726@group