[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 28e7b51: Rename shell-split-string to split-string-shell-command
From: |
Lars Ingebrigtsen |
Subject: |
master 28e7b51: Rename shell-split-string to split-string-shell-command |
Date: |
Thu, 15 Jul 2021 04:29:13 -0400 (EDT) |
branch: master
commit 28e7b5104141225f997c82c168a5e60a80caaf3e
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Rename shell-split-string to split-string-shell-command
* lisp/shell.el (split-string-shell-command):
* doc/lispref/processes.texi (Shell Arguments): Rename from
shell-split-string.
---
doc/lispref/processes.texi | 4 ++--
etc/NEWS | 2 +-
lisp/shell.el | 2 +-
test/lisp/shell-tests.el | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index c8e9f0c..90c4215 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -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
diff --git a/etc/NEWS b/etc/NEWS
index 29c2d9d..7388a0f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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.
diff --git a/lisp/shell.el b/lisp/shell.el
index 15783bb..5444b58 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -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."
diff --git a/test/lisp/shell-tests.el b/test/lisp/shell-tests.el
index ad54644..1e5de71 100644
--- a/test/lisp/shell-tests.el
+++ b/test/lisp/shell-tests.el
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 28e7b51: Rename shell-split-string to split-string-shell-command,
Lars Ingebrigtsen <=