From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 8 Dec 2005 18:07:17 +0000 (+0000)
Subject: (Intro to Minibuffers): Replace list of local maps
X-Git-Tag: emacs-pretest-22.0.90~5436
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e41b5a3e770a6500b5d18f08f1babff0b808c31;p=emacs.git

(Intro to Minibuffers): Replace list of local maps
with xrefs and better explanation.
(Completion Commands): Add the filename completion maps.
---

diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index ced4524c4c0..34284cdacdf 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -85,25 +85,12 @@ permit or forbid recursive minibuffers by setting the variable
 @code{enable-recursive-minibuffers} or by putting properties of that
 name on command symbols (@pxref{Recursive Mini}).
 
-  Like other buffers, a minibuffer may use any of several local keymaps
-(@pxref{Keymaps}); these contain various exit commands and in some cases
-completion commands (@pxref{Completion}).
-
-@itemize @bullet
-@item
-@code{minibuffer-local-map} is for ordinary input (no completion).
-
-@item
-@code{minibuffer-local-ns-map} is similar, except that @key{SPC} exits
-just like @key{RET}.
-
-@item
-@code{minibuffer-local-completion-map} is for permissive completion.
-
-@item
-@code{minibuffer-local-must-match-map} is for strict completion and
-for cautious completion.
-@end itemize
+  Like other buffers, a minibuffer use a local keymap
+(@pxref{Keymaps}) to specify special key bindings.  The function that
+invokes the minibuffer also sets up its local map according to the job
+to be done.  @xref{Text from Minibuffer}, for the non-completion
+minibuffer local maps.  @xref{Completion Commands}, for the minibuffer
+local maps for completion.
 
   When Emacs is running in batch mode, any request to read from the
 minibuffer actually reads a line from the standard input descriptor that
@@ -1034,6 +1021,16 @@ bindings:
 with other characters bound as in @code{minibuffer-local-map}.
 @end defvar
 
+@defvar minibuffer-local-filename-completion-map
+This is like @code{minibuffer-local-completion-map}
+except that it does not bind @key{SPC}.
+@end defvar
+
+@defvar minibuffer-local-must-match-filename-map
+This is like @code{minibuffer-local-must-match-map}
+except that it does not bind @key{SPC}.
+@end defvar
+
 @node High-Level Completion
 @subsection High-Level Completion  Functions