procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename shell-split-string to split-string-shell-command

Browse source 
* lisp/shell.el (split-string-shell-command):
* doc/lispref/processes.texi (Shell Arguments): Rename from
shell-split-string.
This commit is contained in:
Lars Ingebrigtsen 2021-07-15 10:29:04 +02:00
parent 4fb6cf3f38
commit 28e7b51041
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/processes.texi
View file

@ -247,12 +247,12 @@ protected by @code{shell-quote-argument};
@code{combine-and-quote-strings} is @emph{not} intended to protect
special characters from shell evaluation.
@defun shell-split-string string
@defun split-string-shell-command string
This function splits @var{string} into substrings, respecting double
and single quotes, as well as backslash quoting.
@smallexample
(shell-split-string "ls /tmp/'foo bar'")
(split-string-shell-command "ls /tmp/'foo bar'")
@result{} ("ls" "/tmp/foo bar")
@end smallexample
@end defun

2
etc/NEWS
View file

@ -2971,7 +2971,7 @@ The former is now declared obsolete.
* Lisp Changes in Emacs 28.1
+++
*** New function 'shell-split-string'.
*** New function 'split-string-shell-command'.
This splits a shell string into separate components, respecting single
and double quotes, as well as backslash quoting.

2
lisp/shell.el
View file

@ -459,7 +459,7 @@ Useful for shells like zsh that has this feature."
(push (mapconcat #'identity (nreverse arg) "") args)))
(cons (nreverse args) (nreverse begins)))))
(defun shell-split-string (string)
(defun split-string-shell-command (string)
"Split STRING (a shell command) into a list of strings.
General shell syntax, like single and double quoting, as well as
backslash quoting, is respected."

12
test/lisp/shell-tests.el
View file

@ -46,17 +46,17 @@
'(("cd" "ba" "") 1 4 7)))))
(ert-deftest shell-tests-split-string ()
(should (equal (shell-split-string "ls /tmp")
(should (equal (split-string-shell-command "ls /tmp")
'("ls" "/tmp")))
(should (equal (shell-split-string "ls '/tmp/foo bar'")
(should (equal (split-string-shell-command "ls '/tmp/foo bar'")
'("ls" "/tmp/foo bar")))
(should (equal (shell-split-string "ls \"/tmp/foo bar\"")
(should (equal (split-string-shell-command "ls \"/tmp/foo bar\"")
'("ls" "/tmp/foo bar")))
(should (equal (shell-split-string "ls /tmp/'foo bar'")
(should (equal (split-string-shell-command "ls /tmp/'foo bar'")
'("ls" "/tmp/foo bar")))
(should (equal (shell-split-string "ls /tmp/'foo\\ bar'")
(should (equal (split-string-shell-command "ls /tmp/'foo\\ bar'")
'("ls" "/tmp/foo\\ bar")))
(should (equal (shell-split-string "ls /tmp/foo\\ bar")
(should (equal (split-string-shell-command "ls /tmp/foo\\ bar")
'("ls" "/tmp/foo bar"))))
;;; shell-tests.el ends here