summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/strings.texi7
-rw-r--r--etc/NEWS1
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index aae5a1a6cc2..c598cf0f5aa 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-23 Xue Fuqiao <xfq.free@gmail.com>
+
+ * strings.texi (Creating Strings): Document TRIM in `split-string'.
+
2013-12-23 Chong Yidong <cyd@gnu.org>
* keymaps.texi (Controlling Active Maps): Renamed
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 340115062f9..0fe319d97fb 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -268,7 +268,7 @@ string to be used as a shell command, see @ref{Shell Arguments,
combine-and-quote-strings}.
@end defun
-@defun split-string string &optional separators omit-nulls
+@defun split-string string &optional separators omit-nulls trim
This function splits @var{string} into substrings based on the regular
expression @var{separators} (@pxref{Regular Expressions}). Each match
for @var{separators} defines a splitting point; the substrings between
@@ -350,6 +350,11 @@ practice:
@result{} ("o" "o" "o")
@end example
+If the optional argument @var{trim} is non-@code{nil}, it should be a
+regular expression to match text to trim from the beginning and end of
+each substring. If trimming makes the substring empty, it is treated
+as null.
+
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}.
diff --git a/etc/NEWS b/etc/NEWS
index 0496e0d8778..2b5644a2827 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -983,6 +983,7 @@ The few hooks that used with-wrapper-hook are replaced as follows:
** `byte-compile-interactive-only-functions' is now obsolete.
It has been replaced by the symbol property 'interactive-only.
++++
** `split-string' now takes an optional argument TRIM.
The value, if non-nil, is a regexp that specifies what to trim from
the start and end of each substring.