summaryrefslogtreecommitdiff
path: root/doc/lispref
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-12-11 20:45:53 +0200
committerEli Zaretskii <eliz@gnu.org>2010-12-11 20:45:53 +0200
commit4bb49a92aa12b7c607cc648b7598fde22216f06e (patch)
treec80f2571a4d95f50a9b326f4726cddcf0a0ff909 /doc/lispref
parent76feb8641e5870c73b649a6e986b5d8d8936a61f (diff)
downloademacs-4bb49a92aa12b7c607cc648b7598fde22216f06e.tar.gz
Fallout from bug #7563.
processes.texi (Shell Arguments): strings.texi (Creating Strings): Don't mention "shell commands"; make it explicit that `split-string-and-unquote' and `combine-and-quote-strings' are mainly for working with arguments to call-process and start-process.
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/processes.texi16
-rw-r--r--doc/lispref/strings.texi6
3 files changed, 17 insertions, 11 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 50c23da7027..970da3f5ff2 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,11 @@
2010-12-11 Eli Zaretskii <eliz@gnu.org>
+ * processes.texi (Shell Arguments):
+ * strings.texi (Creating Strings): Don't mention "shell commands";
+ make it explicit that `split-string-and-unquote' and
+ `combine-and-quote-strings' are mainly for working with arguments
+ to call-process and start-process.
+
* processes.texi (Shell Arguments): Fix documentation of
`split-string-and-unquote'. Add indexing. (Bug#7563)
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index e281c0d5917..8136fedb7f0 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -199,11 +199,12 @@ a shell command:
@cindex minibuffer input, and command-line arguments
@cindex @code{call-process}, command-line arguments from minibuffer
@cindex @code{start-process}, command-line arguments from minibuffer
- The following two functions are useful for creating shell commands
-from individual argument strings, and taking shell command lines apart
-into individual arguments. These functions are mainly intended to be
-used for converting user input in the minibuffer, a Lisp string, into
-a list of string arguments to be passed to @code{call-process} or
+ The following two functions are useful for combining a list of
+individual command-line argument strings into a single string, and
+taking a string apart into a list of individual command-line
+arguments. These functions are mainly intended to be used for
+converting user input in the minibuffer, a Lisp string, into a list of
+string arguments to be passed to @code{call-process} or
@code{start-process}, or for the converting such lists of arguments in
a single Lisp string to be presented in the minibuffer or echo area.
@@ -233,9 +234,8 @@ resulting string.
The strings in @var{list-of-strings} that need quoting are those that
include @var{separator} as their substring. Quoting a string encloses
it in double quotes @code{"@dots{}"}. In the simplest case, if you
-are consing a shell command from the individual command-line
-arguments, every argument that includes embedded blanks will be
-quoted.
+are consing a command from the individual command-line arguments,
+every argument that includes embedded blanks will be quoted.
@end defun
@node Synchronous Processes
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 94d2765a833..cc74c2cbf8a 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -348,9 +348,9 @@ practice:
@result{} ("o" "o" "o")
@end example
-If you need to split a string that is a shell command, where
-individual arguments could be quoted, see @ref{Shell Arguments,
-split-string-and-unquote}.
+If you need to split a string into a list of individual command-line
+arguments suitable for @code{call-process} or @code{start-process},
+see @ref{Shell Arguments, split-string-and-unquote}.
@end defun
@defvar split-string-default-separators