aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-10-20 10:41:50 +0000
committerEli Zaretskii2008-10-20 10:41:50 +0000
commitd8f0f8a5e490e2d99979e155cec9186b3b874fa8 (patch)
tree577c33b70739a70cb2c77c34bc831f8dda3bf40f
parenta18a6d497c03fd2c5bf229058ba4faaa2d5c2f42 (diff)
downloademacs-d8f0f8a5e490e2d99979e155cec9186b3b874fa8.tar.gz
emacs-d8f0f8a5e490e2d99979e155cec9186b3b874fa8.zip
(Reading File Names): Wording changes from RMS.
-rw-r--r--doc/lispref/minibuf.texi25
1 files changed, 11 insertions, 14 deletions
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 659b7812e86..e846fe2727c 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1276,7 +1276,7 @@ and @code{read-input-method-name}, in @ref{Input Methods}.
1276@cindex read file names 1276@cindex read file names
1277@cindex prompt for file name 1277@cindex prompt for file name
1278 1278
1279 Here is a couple of other high-level completion function, designed 1279 Here is a couple of other high-level completion functions, designed
1280for reading file names and shell commands. They provide special 1280for reading file names and shell commands. They provide special
1281features including automatic insertion of the default directory. 1281features including automatic insertion of the default directory.
1282 1282
@@ -1465,20 +1465,17 @@ The file is @point{}
1465This function reads a shell command from the minibuffer, prompting 1465This function reads a shell command from the minibuffer, prompting
1466with @var{prompt} and providing intelligent completion. It completes 1466with @var{prompt} and providing intelligent completion. It completes
1467the first word of the command using candidates that are appropriate 1467the first word of the command using candidates that are appropriate
1468for command names. The rest of the shell command arguments are 1468for command names, and the rest of the command words as file names.
1469completed as file names. 1469
1470 1470This function uses @code{minibuffer-local-shell-command-map} as the
1471This function works by calling @code{read-from-minibuffer} 1471keymap for minibuffer input. The @var{hist} argument specifies the
1472(@pxref{Text from Minibuffer}), passing it 1472history list to use; if is omitted or @code{nil}, it defaults to
1473@code{minibuffer-local-shell-command-map} as the @var{keymap}
1474argument. The optional arguments @var{initial-contents} and
1475@var{hist} are passed to @code{read-from-minibuffer} unaltered, except
1476that if @var{hist} is omitted or @code{nil}, it defaults to
1477@code{shell-command-history} (@pxref{Minibuffer History, 1473@code{shell-command-history} (@pxref{Minibuffer History,
1478shell-command-history}), and the @var{read} argument is passed as 1474shell-command-history}). The optional argument @var{initial-contents}
1479@code{nil}. The rest of @var{args}, if present, are used by 1475specifies the initial content of the minibuffer (@pxref{Initial
1480@code{read-from-minibuffer} as its @var{default} and 1476Input}). The rest of @var{args}, if present, are used as the
1481@var{inherit-input-method} arguments. 1477@var{default} and @var{inherit-input-method} arguments in
1478@code{read-from-minibuffer} (@pxref{Text from Minibuffer}).
1482@end defun 1479@end defun
1483 1480
1484@defvar minibuffer-local-shell-command-map 1481@defvar minibuffer-local-shell-command-map