[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v |
Date: |
Mon, 20 Oct 2008 10:41:51 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/10/20 10:41:51
Index: minibuf.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/minibuf.texi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- minibuf.texi 19 Oct 2008 22:07:30 -0000 1.13
+++ minibuf.texi 20 Oct 2008 10:41:50 -0000 1.14
@@ -1276,7 +1276,7 @@
@cindex read file names
@cindex prompt for file name
- Here is a couple of other high-level completion function, designed
+ Here is a couple of other high-level completion functions, designed
for reading file names and shell commands. They provide special
features including automatic insertion of the default directory.
@@ -1465,20 +1465,17 @@
This function reads a shell command from the minibuffer, prompting
with @var{prompt} and providing intelligent completion. It completes
the first word of the command using candidates that are appropriate
-for command names. The rest of the shell command arguments are
-completed as file names.
+for command names, and the rest of the command words as file names.
-This function works by calling @code{read-from-minibuffer}
-(@pxref{Text from Minibuffer}), passing it
address@hidden as the @var{keymap}
-argument. The optional arguments @var{initial-contents} and
address@hidden are passed to @code{read-from-minibuffer} unaltered, except
-that if @var{hist} is omitted or @code{nil}, it defaults to
+This function uses @code{minibuffer-local-shell-command-map} as the
+keymap for minibuffer input. The @var{hist} argument specifies the
+history list to use; if is omitted or @code{nil}, it defaults to
@code{shell-command-history} (@pxref{Minibuffer History,
-shell-command-history}), and the @var{read} argument is passed as
address@hidden The rest of @var{args}, if present, are used by
address@hidden as its @var{default} and
address@hidden arguments.
+shell-command-history}). The optional argument @var{initial-contents}
+specifies the initial content of the minibuffer (@pxref{Initial
+Input}). The rest of @var{args}, if present, are used as the
address@hidden and @var{inherit-input-method} arguments in
address@hidden (@pxref{Text from Minibuffer}).
@end defun
@defvar minibuffer-local-shell-command-map
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Eli Zaretskii, 2008/10/18
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Eli Zaretskii, 2008/10/18
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Eli Zaretskii, 2008/10/18
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Eli Zaretskii, 2008/10/19
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Juri Linkov, 2008/10/19
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v,
Eli Zaretskii <=
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Eli Zaretskii, 2008/10/21