[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100305: Fallout from bug #7563.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100305
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-12-11 20:45:53 +0200
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/processes.texi
  doc/lispref/strings.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-12-11 09:41:45 +0000
+++ b/doc/lispref/ChangeLog     2010-12-11 18:45:53 +0000
@@ -1,5 +1,11 @@
 2010-12-11  Eli Zaretskii  <address@hidden>
 
+       * 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)
 

=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi        2010-12-11 09:41:45 +0000
+++ b/doc/lispref/processes.texi        2010-12-11 18:45:53 +0000
@@ -199,11 +199,12 @@
 @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 @@
 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

=== modified file 'doc/lispref/strings.texi'
--- a/doc/lispref/strings.texi  2010-11-21 18:07:47 +0000
+++ b/doc/lispref/strings.texi  2010-12-11 18:45:53 +0000
@@ -348,9 +348,9 @@
      @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