aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-12-11 11:41:45 +0200
committerEli Zaretskii2010-12-11 11:41:45 +0200
commit3c73e30e34593dbd43ac6bdd8b6cdf70f493e3a2 (patch)
tree49586a06d943c0017670843462a1f3baf055934c
parent68f75971cc0228edb80d22728d6f83494d1594b5 (diff)
downloademacs-3c73e30e34593dbd43ac6bdd8b6cdf70f493e3a2.tar.gz
emacs-3c73e30e34593dbd43ac6bdd8b6cdf70f493e3a2.zip
Fix bug #7563 with docs of split-string-and-unquote.
processes.texi (Shell Arguments): Fix documentation of `split-string-and-unquote'. Add indexing.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/processes.texi13
2 files changed, 15 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b27efdda941..50c23da7027 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12010-12-11 Eli Zaretskii <eliz@gnu.org>
2
3 * processes.texi (Shell Arguments): Fix documentation of
4 `split-string-and-unquote'. Add indexing. (Bug#7563)
5
12010-12-07 Stefan Monnier <monnier@iro.umontreal.ca> 62010-12-07 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * modes.texi (Auto-Indentation): New section to document SMIE. 8 * modes.texi (Auto-Indentation): New section to document SMIE.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 1a4a766c81c..e281c0d5917 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -195,10 +195,17 @@ a shell command:
195@end example 195@end example
196@end defun 196@end defun
197 197
198@cindex quoting and unquoting shell command line 198@cindex quoting and unquoting command-line arguments
199@cindex minibuffer input, and command-line arguments
200@cindex @code{call-process}, command-line arguments from minibuffer
201@cindex @code{start-process}, command-line arguments from minibuffer
199 The following two functions are useful for creating shell commands 202 The following two functions are useful for creating shell commands
200from individual argument strings, and taking shell command lines apart 203from individual argument strings, and taking shell command lines apart
201into individual arguments. 204into individual arguments. These functions are mainly intended to be
205used for converting user input in the minibuffer, a Lisp string, into
206a list of string arguments to be passed to @code{call-process} or
207@code{start-process}, or for the converting such lists of arguments in
208a single Lisp string to be presented in the minibuffer or echo area.
202 209
203@defun split-string-and-unquote string &optional separators 210@defun split-string-and-unquote string &optional separators
204This function splits @var{string} into substrings at matches for the 211This function splits @var{string} into substrings at matches for the
@@ -210,7 +217,7 @@ If @var{separators} is omitted or @code{nil}, it defaults to
210@code{"\\s-+"}, which is a regular expression that matches one or more 217@code{"\\s-+"}, which is a regular expression that matches one or more
211characters with whitespace syntax (@pxref{Syntax Class Table}). 218characters with whitespace syntax (@pxref{Syntax Class Table}).
212 219
213This function performs two types of quoting: enclosing a whole string 220This function supports two types of quoting: enclosing a whole string
214in double quotes @code{"@dots{}"}, and quoting individual characters 221in double quotes @code{"@dots{}"}, and quoting individual characters
215with a backslash escape @samp{\}. The latter is also used in Lisp 222with a backslash escape @samp{\}. The latter is also used in Lisp
216strings, so this function can handle those as well. 223strings, so this function can handle those as well.