diff options
| author | Eli Zaretskii | 2010-12-11 20:45:53 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-12-11 20:45:53 +0200 |
| commit | 4bb49a92aa12b7c607cc648b7598fde22216f06e (patch) | |
| tree | c80f2571a4d95f50a9b326f4726cddcf0a0ff909 | |
| parent | 76feb8641e5870c73b649a6e986b5d8d8936a61f (diff) | |
| download | emacs-4bb49a92aa12b7c607cc648b7598fde22216f06e.tar.gz emacs-4bb49a92aa12b7c607cc648b7598fde22216f06e.zip | |
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.
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/processes.texi | 16 | ||||
| -rw-r--r-- | doc/lispref/strings.texi | 6 |
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 @@ | |||
| 1 | 2010-12-11 Eli Zaretskii <eliz@gnu.org> | 1 | 2010-12-11 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * processes.texi (Shell Arguments): | ||
| 4 | * strings.texi (Creating Strings): Don't mention "shell commands"; | ||
| 5 | make it explicit that `split-string-and-unquote' and | ||
| 6 | `combine-and-quote-strings' are mainly for working with arguments | ||
| 7 | to call-process and start-process. | ||
| 8 | |||
| 3 | * processes.texi (Shell Arguments): Fix documentation of | 9 | * processes.texi (Shell Arguments): Fix documentation of |
| 4 | `split-string-and-unquote'. Add indexing. (Bug#7563) | 10 | `split-string-and-unquote'. Add indexing. (Bug#7563) |
| 5 | 11 | ||
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: | |||
| 199 | @cindex minibuffer input, and command-line arguments | 199 | @cindex minibuffer input, and command-line arguments |
| 200 | @cindex @code{call-process}, command-line arguments from minibuffer | 200 | @cindex @code{call-process}, command-line arguments from minibuffer |
| 201 | @cindex @code{start-process}, command-line arguments from minibuffer | 201 | @cindex @code{start-process}, command-line arguments from minibuffer |
| 202 | The following two functions are useful for creating shell commands | 202 | The following two functions are useful for combining a list of |
| 203 | from individual argument strings, and taking shell command lines apart | 203 | individual command-line argument strings into a single string, and |
| 204 | into individual arguments. These functions are mainly intended to be | 204 | taking a string apart into a list of individual command-line |
| 205 | used for converting user input in the minibuffer, a Lisp string, into | 205 | arguments. These functions are mainly intended to be used for |
| 206 | a list of string arguments to be passed to @code{call-process} or | 206 | converting user input in the minibuffer, a Lisp string, into a list of |
| 207 | string arguments to be passed to @code{call-process} or | ||
| 207 | @code{start-process}, or for the converting such lists of arguments in | 208 | @code{start-process}, or for the converting such lists of arguments in |
| 208 | a single Lisp string to be presented in the minibuffer or echo area. | 209 | a single Lisp string to be presented in the minibuffer or echo area. |
| 209 | 210 | ||
| @@ -233,9 +234,8 @@ resulting string. | |||
| 233 | The strings in @var{list-of-strings} that need quoting are those that | 234 | The strings in @var{list-of-strings} that need quoting are those that |
| 234 | include @var{separator} as their substring. Quoting a string encloses | 235 | include @var{separator} as their substring. Quoting a string encloses |
| 235 | it in double quotes @code{"@dots{}"}. In the simplest case, if you | 236 | it in double quotes @code{"@dots{}"}. In the simplest case, if you |
| 236 | are consing a shell command from the individual command-line | 237 | are consing a command from the individual command-line arguments, |
| 237 | arguments, every argument that includes embedded blanks will be | 238 | every argument that includes embedded blanks will be quoted. |
| 238 | quoted. | ||
| 239 | @end defun | 239 | @end defun |
| 240 | 240 | ||
| 241 | @node Synchronous Processes | 241 | @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: | |||
| 348 | @result{} ("o" "o" "o") | 348 | @result{} ("o" "o" "o") |
| 349 | @end example | 349 | @end example |
| 350 | 350 | ||
| 351 | If you need to split a string that is a shell command, where | 351 | If you need to split a string into a list of individual command-line |
| 352 | individual arguments could be quoted, see @ref{Shell Arguments, | 352 | arguments suitable for @code{call-process} or @code{start-process}, |
| 353 | split-string-and-unquote}. | 353 | see @ref{Shell Arguments, split-string-and-unquote}. |
| 354 | @end defun | 354 | @end defun |
| 355 | 355 | ||
| 356 | @defvar split-string-default-separators | 356 | @defvar split-string-default-separators |