summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2016-07-03 09:56:36 -0400
committerNoam Postavsky <npostavs@gmail.com>2016-07-03 15:05:20 -0400
commit178b2f590982e37991bc72b08a9e02b64d750601 (patch)
treebbc08a39311cd65d9870376dda28de3d451efb16 /lisp
parentdec756756070d271925c8c2a705de97eb8d7fb0b (diff)
downloademacs-178b2f590982e37991bc72b08a9e02b64d750601.tar.gz
Note combine-and-quote-strings doesn't shell quote
* doc/lispref/processes.texi (Shell Arguments): * lisp/subr.el (combine-and-quote-strings): Add a note that combine-and-quote-strings doesn't protect arguments against shell evaluation (Bug #20333).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/subr.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index ed2166a0ee2..e9e19d35f65 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3706,7 +3706,10 @@ Modifies the match data; use `save-match-data' if necessary."
"Concatenate the STRINGS, adding the SEPARATOR (default \" \").
This tries to quote the strings to avoid ambiguity such that
(split-string-and-unquote (combine-and-quote-strings strs)) == strs
-Only some SEPARATORs will work properly."
+Only some SEPARATORs will work properly.
+
+Note that this is not intended to protect STRINGS from
+interpretation by shells, use `shell-quote-argument' for that."
(let* ((sep (or separator " "))
(re (concat "[\\\"]" "\\|" (regexp-quote sep))))
(mapconcat