aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2000-02-14 23:36:15 +0000
committerStefan Monnier2000-02-14 23:36:15 +0000
commitb9b84fd34dce0840095349b5ada09285039f8bff (patch)
treedc8e433010b2d66c29b50176f7e3851936effcf7 /src
parent3a28db80b0af5cd6ab1d083427e205581bb00cb1 (diff)
downloademacs-b9b84fd34dce0840095349b5ada09285039f8bff.tar.gz
emacs-b9b84fd34dce0840095349b5ada09285039f8bff.zip
(Ftry_completion, Fall_completions): Add a reference to
`completion-regexp-list' in the docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/minibuf.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8ea781c54c1..bc8436677bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-02-14 Stefan Monnier <monnier@cs.yale.edu>
2
3 * minibuf.c (Ftry_completion, Fall_completions): Add a reference to
4 `completion-regexp-list' in the docstring.
5
12000-02-14 Dave Love <fx@gnu.org> 62000-02-14 Dave Love <fx@gnu.org>
2 7
3 * xfaces.c (tty_defined_color): Declare color_idx unsigned long. 8 * xfaces.c (tty_defined_color): Declare color_idx unsigned long.
diff --git a/src/minibuf.c b/src/minibuf.c
index 406c1961186..32bf540bdae 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1034,7 +1034,9 @@ If optional third argument PREDICATE is non-nil,\n\
1034it is used to test each possible match.\n\ 1034it is used to test each possible match.\n\
1035The match is a candidate only if PREDICATE returns non-nil.\n\ 1035The match is a candidate only if PREDICATE returns non-nil.\n\
1036The argument given to PREDICATE is the alist element\n\ 1036The argument given to PREDICATE is the alist element\n\
1037or the symbol from the obarray.") 1037or the symbol from the obarray.\n\
1038Additionally to this predicate, `completion-regexp-list'\n\
1039is used to further constrain the set of candidates.")
1038 (string, alist, predicate) 1040 (string, alist, predicate)
1039 Lisp_Object string, alist, predicate; 1041 Lisp_Object string, alist, predicate;
1040{ 1042{
@@ -1281,6 +1283,8 @@ it is used to test each possible match.\n\
1281The match is a candidate only if PREDICATE returns non-nil.\n\ 1283The match is a candidate only if PREDICATE returns non-nil.\n\
1282The argument given to PREDICATE is the alist element\n\ 1284The argument given to PREDICATE is the alist element\n\
1283or the symbol from the obarray.\n\ 1285or the symbol from the obarray.\n\
1286Additionally to this predicate, `completion-regexp-list'\n\
1287is used to further constrain the set of candidates.\n\
1284\n\ 1288\n\
1285If the optional fourth argument HIDE-SPACES is non-nil,\n\ 1289If the optional fourth argument HIDE-SPACES is non-nil,\n\
1286strings in ALIST that start with a space\n\ 1290strings in ALIST that start with a space\n\