summaryrefslogtreecommitdiff
path: root/doc/lispref/minibuf.texi
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-04-04 18:32:35 +0800
committerChong Yidong <cyd@gnu.org>2012-04-04 18:32:35 +0800
commit245d176baccb64765ec2f1726f39b927c95a3e16 (patch)
tree1eed5b44e3936ed3f5637823b45fff6c1d4c0677 /doc/lispref/minibuf.texi
parent321cc491c5843ee3af86570d5b2d59b98ba0c422 (diff)
downloademacs-245d176baccb64765ec2f1726f39b927c95a3e16.tar.gz
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.
Diffstat (limited to 'doc/lispref/minibuf.texi')
-rw-r--r--doc/lispref/minibuf.texi19
1 files changed, 12 insertions, 7 deletions
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.
They are described in the following section.
@end defun
+@defvar completing-read-function
+The value of this variable must be a function, which is called by
+@code{completing-read} to actually do its work. It should accept the
+same arguments as @code{completing-read}. This can be bound to a
+different function to completely override the normal behavior of
+@code{completing-read}.
+@end defvar
+
@node Completion Commands
@subsection Minibuffer Commands that Do Completion
@@ -1377,11 +1385,7 @@ name. You must call @code{expand-file-name} yourself if an absolute
file name is required.
The optional argument @var{require-match} has the same meaning as in
-@code{completing-read}. @xref{Minibuffer Completion}. If
-@var{require-match} is @code{nil}, the local keymap in the minibuffer
-is @code{minibuffer-local-filename-completion-map}; otherwise, it is
-@code{minibuffer-local-filename-must-match-map}. @xref{Completion
-Commands}.
+@code{completing-read}. @xref{Minibuffer Completion}.
The argument @var{directory} specifies the directory to use for
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
alternatives will be generated from this completion table in the usual
way, via the completion styles defined in @code{completion-styles}
(@pxref{Completion Variables}). @var{props} is a property list for
-additional information; the following optional properties are
-recognized:
+additional information; any of the properties in
+@code{completion-extra-properties} are recognized (@pxref{Completion
+Variables}), as well as the following additional ones:
@table @code
@item :predicate