diff options
| author | Eli Zaretskii | 2007-01-27 18:01:15 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2007-01-27 18:01:15 +0000 |
| commit | 4fda07c1a645b7d3bae345f767212d7d215fa21e (patch) | |
| tree | 38846d4955f7a4ca27a9669d1661952f428eceff /src | |
| parent | 05b531f69577fc9f2bbbd3cfe7c12f1132e7fce6 (diff) | |
| download | emacs-4fda07c1a645b7d3bae345f767212d7d215fa21e.tar.gz emacs-4fda07c1a645b7d3bae345f767212d7d215fa21e.zip | |
(Fcompleting_read): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/minibuf.c | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5f022e54e0..f0d1b80ad72 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-01-27 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * minibuf.c (Fcompleting_read): Doc fix. | ||
| 4 | |||
| 1 | 2007-01-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 5 | 2007-01-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * gtkutil.c (xg_initialize): Call XftInit if HAVE_XFT. | 7 | * gtkutil.c (xg_initialize): Call XftInit if HAVE_XFT. |
diff --git a/src/minibuf.c b/src/minibuf.c index 5618f0223a4..9c078a37b3d 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -1686,11 +1686,16 @@ Lisp_Object Vminibuffer_completing_file_name; | |||
| 1686 | DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0, | 1686 | DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0, |
| 1687 | doc: /* Read a string in the minibuffer, with completion. | 1687 | doc: /* Read a string in the minibuffer, with completion. |
| 1688 | PROMPT is a string to prompt with; normally it ends in a colon and a space. | 1688 | PROMPT is a string to prompt with; normally it ends in a colon and a space. |
| 1689 | TABLE can be a list of strings, an alist, an obarray or a hash table. | 1689 | |
| 1690 | TABLE can also be a function to do the completion itself. | 1690 | TABLE can be a list of strings, an alist, an obarray or a hash table; their |
| 1691 | elements are tested to see if they begin with STRING. | ||
| 1692 | TABLE can also be a function to do the completion itself; it receives | ||
| 1693 | three arguments: the values STRING, PREDICATE and nil. | ||
| 1694 | Whatever it returns becomes the value of `try-completion'. | ||
| 1695 | |||
| 1691 | PREDICATE limits completion to a subset of TABLE. | 1696 | PREDICATE limits completion to a subset of TABLE. |
| 1692 | See `try-completion' and `all-completions' for more details | 1697 | See `try-completion' and `all-completions' for more details |
| 1693 | on completion, TABLE, and PREDICATE. | 1698 | on completion, TABLE (called "alist" there), and PREDICATE. |
| 1694 | 1699 | ||
| 1695 | If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless | 1700 | If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless |
| 1696 | the input is (or completes to) an element of TABLE or is null. | 1701 | the input is (or completes to) an element of TABLE or is null. |