[Emacs-diffs] /srv/bzr/emacs/trunk r107761: Some more completion updates for Lisp manual.

[Chong Yidong]

------------------------------------------------------------
revno: 107761
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-04-04 18:32:35 +0800
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/minibuf.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-04-04 09:19:32 +0000
+++ b/doc/lispref/ChangeLog     2012-04-04 10:32:35 +0000
@@ -5,6 +5,11 @@
        (Completion Variables): Rename from Completion Styles.  Document
        completion-extra-properties.  Document completion-styles-alist
        change.
+       (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.
 
        * display.texi (Delayed Warnings): New node.
 

=== modified file 'doc/lispref/minibuf.texi'
--- a/doc/lispref/minibuf.texi  2012-04-04 09:19:32 +0000
+++ b/doc/lispref/minibuf.texi  2012-04-04 10:32:35 +0000
@@ -985,6 +985,14 @@
 They are described in the following section.
 @end defun
 
address@hidden completing-read-function
+The value of this variable must be a function, which is called by
address@hidden 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
address@hidden
address@hidden defvar
+
 @node Completion Commands
 @subsection Minibuffer Commands that Do Completion
 
@@ -1377,11 +1385,7 @@
 file name is required.
 
 The optional argument @var{require-match} has the same meaning as in
address@hidden  @xref{Minibuffer Completion}.  If
address@hidden is @code{nil}, the local keymap in the minibuffer
-is @code{minibuffer-local-filename-completion-map}; otherwise, it is
address@hidden  @xref{Completion
-Commands}.
address@hidden  @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 @@
 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
address@hidden are recognized (@pxref{Completion
+Variables}), as well as the following additional ones:
 
 @table @code
 @item :predicate