diff options
| author | Chong Yidong | 2012-04-04 18:32:35 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-04 18:32:35 +0800 |
| commit | 245d176baccb64765ec2f1726f39b927c95a3e16 (patch) | |
| tree | 1eed5b44e3936ed3f5637823b45fff6c1d4c0677 | |
| parent | 321cc491c5843ee3af86570d5b2d59b98ba0c422 (diff) | |
| download | emacs-245d176baccb64765ec2f1726f39b927c95a3e16.tar.gz emacs-245d176baccb64765ec2f1726f39b927c95a3e16.zip | |
Some more completion updates for Lisp manual.
* doc/lispref/minibuf.texi (Reading File Names): minibuffer-local-filename-must-match-map is
not used anymore.
(Minibuffer Completion): Document completing-read-function.
(Completion in Buffers): completion-at-point-functions can return
properties recognized in completion-extra-properties.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/minibuf.texi | 19 |
2 files changed, 17 insertions, 7 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 6385400572e..c0c355b0e83 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -5,6 +5,11 @@ | |||
| 5 | (Completion Variables): Rename from Completion Styles. Document | 5 | (Completion Variables): Rename from Completion Styles. Document |
| 6 | completion-extra-properties. Document completion-styles-alist | 6 | completion-extra-properties. Document completion-styles-alist |
| 7 | change. | 7 | change. |
| 8 | (Reading File Names): minibuffer-local-filename-must-match-map is | ||
| 9 | not used anymore. | ||
| 10 | (Minibuffer Completion): Document completing-read-function. | ||
| 11 | (Completion in Buffers): completion-at-point-functions can return | ||
| 12 | properties recognized in completion-extra-properties. | ||
| 8 | 13 | ||
| 9 | * display.texi (Delayed Warnings): New node. | 14 | * display.texi (Delayed Warnings): New node. |
| 10 | 15 | ||
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 0d7e2350bd7..8e1bd4bf5ee 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi | |||
| @@ -985,6 +985,14 @@ information to the commands that actually do completion. | |||
| 985 | They are described in the following section. | 985 | They are described in the following section. |
| 986 | @end defun | 986 | @end defun |
| 987 | 987 | ||
| 988 | @defvar completing-read-function | ||
| 989 | The value of this variable must be a function, which is called by | ||
| 990 | @code{completing-read} to actually do its work. It should accept the | ||
| 991 | same arguments as @code{completing-read}. This can be bound to a | ||
| 992 | different function to completely override the normal behavior of | ||
| 993 | @code{completing-read}. | ||
| 994 | @end defvar | ||
| 995 | |||
| 988 | @node Completion Commands | 996 | @node Completion Commands |
| 989 | @subsection Minibuffer Commands that Do Completion | 997 | @subsection Minibuffer Commands that Do Completion |
| 990 | 998 | ||
| @@ -1377,11 +1385,7 @@ name. You must call @code{expand-file-name} yourself if an absolute | |||
| 1377 | file name is required. | 1385 | file name is required. |
| 1378 | 1386 | ||
| 1379 | The optional argument @var{require-match} has the same meaning as in | 1387 | The optional argument @var{require-match} has the same meaning as in |
| 1380 | @code{completing-read}. @xref{Minibuffer Completion}. If | 1388 | @code{completing-read}. @xref{Minibuffer Completion}. |
| 1381 | @var{require-match} is @code{nil}, the local keymap in the minibuffer | ||
| 1382 | is @code{minibuffer-local-filename-completion-map}; otherwise, it is | ||
| 1383 | @code{minibuffer-local-filename-must-match-map}. @xref{Completion | ||
| 1384 | Commands}. | ||
| 1385 | 1389 | ||
| 1386 | The argument @var{directory} specifies the directory to use for | 1390 | The argument @var{directory} specifies the directory to use for |
| 1387 | completing relative file names. It should be an absolute directory | 1391 | completing relative file names. It should be an absolute directory |
| @@ -1750,8 +1754,9 @@ that text, in a form suitable for passing as the second argument to | |||
| 1750 | alternatives will be generated from this completion table in the usual | 1754 | alternatives will be generated from this completion table in the usual |
| 1751 | way, via the completion styles defined in @code{completion-styles} | 1755 | way, via the completion styles defined in @code{completion-styles} |
| 1752 | (@pxref{Completion Variables}). @var{props} is a property list for | 1756 | (@pxref{Completion Variables}). @var{props} is a property list for |
| 1753 | additional information; the following optional properties are | 1757 | additional information; any of the properties in |
| 1754 | recognized: | 1758 | @code{completion-extra-properties} are recognized (@pxref{Completion |
| 1759 | Variables}), as well as the following additional ones: | ||
| 1755 | 1760 | ||
| 1756 | @table @code | 1761 | @table @code |
| 1757 | @item :predicate | 1762 | @item :predicate |