diff options
| author | Richard M. Stallman | 2005-12-08 18:07:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-12-08 18:07:17 +0000 |
| commit | 5e41b5a3e770a6500b5d18f08f1babff0b808c31 (patch) | |
| tree | c5020e62ce9d5451be0ab78566a739ca049844c7 | |
| parent | c90475c9f9c64b0e5fac2f524556df5da9c42ea0 (diff) | |
| download | emacs-5e41b5a3e770a6500b5d18f08f1babff0b808c31.tar.gz emacs-5e41b5a3e770a6500b5d18f08f1babff0b808c31.zip | |
(Intro to Minibuffers): Replace list of local maps
with xrefs and better explanation.
(Completion Commands): Add the filename completion maps.
| -rw-r--r-- | lispref/minibuf.texi | 35 |
1 files changed, 16 insertions, 19 deletions
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 | |||
| 85 | @code{enable-recursive-minibuffers} or by putting properties of that | 85 | @code{enable-recursive-minibuffers} or by putting properties of that |
| 86 | name on command symbols (@pxref{Recursive Mini}). | 86 | name on command symbols (@pxref{Recursive Mini}). |
| 87 | 87 | ||
| 88 | Like other buffers, a minibuffer may use any of several local keymaps | 88 | Like other buffers, a minibuffer use a local keymap |
| 89 | (@pxref{Keymaps}); these contain various exit commands and in some cases | 89 | (@pxref{Keymaps}) to specify special key bindings. The function that |
| 90 | completion commands (@pxref{Completion}). | 90 | invokes the minibuffer also sets up its local map according to the job |
| 91 | 91 | to be done. @xref{Text from Minibuffer}, for the non-completion | |
| 92 | @itemize @bullet | 92 | minibuffer local maps. @xref{Completion Commands}, for the minibuffer |
| 93 | @item | 93 | local maps for completion. |
| 94 | @code{minibuffer-local-map} is for ordinary input (no completion). | ||
| 95 | |||
| 96 | @item | ||
| 97 | @code{minibuffer-local-ns-map} is similar, except that @key{SPC} exits | ||
| 98 | just like @key{RET}. | ||
| 99 | |||
| 100 | @item | ||
| 101 | @code{minibuffer-local-completion-map} is for permissive completion. | ||
| 102 | |||
| 103 | @item | ||
| 104 | @code{minibuffer-local-must-match-map} is for strict completion and | ||
| 105 | for cautious completion. | ||
| 106 | @end itemize | ||
| 107 | 94 | ||
| 108 | When Emacs is running in batch mode, any request to read from the | 95 | When Emacs is running in batch mode, any request to read from the |
| 109 | minibuffer actually reads a line from the standard input descriptor that | 96 | minibuffer actually reads a line from the standard input descriptor that |
| @@ -1034,6 +1021,16 @@ bindings: | |||
| 1034 | with other characters bound as in @code{minibuffer-local-map}. | 1021 | with other characters bound as in @code{minibuffer-local-map}. |
| 1035 | @end defvar | 1022 | @end defvar |
| 1036 | 1023 | ||
| 1024 | @defvar minibuffer-local-filename-completion-map | ||
| 1025 | This is like @code{minibuffer-local-completion-map} | ||
| 1026 | except that it does not bind @key{SPC}. | ||
| 1027 | @end defvar | ||
| 1028 | |||
| 1029 | @defvar minibuffer-local-must-match-filename-map | ||
| 1030 | This is like @code{minibuffer-local-must-match-map} | ||
| 1031 | except that it does not bind @key{SPC}. | ||
| 1032 | @end defvar | ||
| 1033 | |||
| 1037 | @node High-Level Completion | 1034 | @node High-Level Completion |
| 1038 | @subsection High-Level Completion Functions | 1035 | @subsection High-Level Completion Functions |
| 1039 | 1036 | ||