[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: |
Sun, 19 Oct 2008 16:09:24 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/10/19 16:09:24
Index: minibuf.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/minibuf.texi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- minibuf.texi 18 Oct 2008 19:31:15 -0000 1.11
+++ minibuf.texi 19 Oct 2008 16:09:24 -0000 1.12
@@ -632,7 +632,8 @@
* Completion Commands:: Minibuffer commands that do completion.
* High-Level Completion:: Convenient special cases of completion
(reading buffer name, file name, etc.)
-* Reading File Names:: Using completion to read file names.
+* Reading File Names:: Using completion to read file names and
+ shell commands.
* Programmed Completion:: Writing your own completion-function.
@end menu
@@ -1275,9 +1276,9 @@
@cindex read file names
@cindex prompt for file name
- Here is another high-level completion function, designed for reading a
-file name. It provides special features including automatic insertion
-of the default directory.
+ Here is a couple of other high-level completion function, designed
+for reading file names and shell commands. They provide special
+features including automatic insertion of the default directory.
@defun read-file-name prompt &optional directory default existing initial
predicate
This function reads a file name in the minibuffer, prompting with
@@ -1460,6 +1461,31 @@
@end example
@end defopt
address@hidden read-shell-command prompt &optional initial-contents hist &rest
args
+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.
+
+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
address@hidden (@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.
address@hidden defun
+
address@hidden minibuffer-local-shell-command-map
+This keymap is used by @code{read-shell-command} for completing
+command and file names that are part of a shell command.
address@hidden defvar
+
@node Programmed Completion
@subsection Programmed Completion
@cindex programmed completion
- [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 <=
- [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, 2008/10/20
- [Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v, Eli Zaretskii, 2008/10/21