[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 269cec1: Remove `string-slice' -- it's not very well defined
From: |
Lars Ingebrigtsen |
Subject: |
master 269cec1: Remove `string-slice' -- it's not very well defined |
Date: |
Thu, 24 Dec 2020 23:16:57 -0500 (EST) |
branch: master
commit 269cec13a2fc6ac18b675d0dadd07a3d4e074a72
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Remove `string-slice' -- it's not very well defined
* doc/lispref/strings.texi (Creating Strings): Ditto.
* lisp/emacs-lisp/subr-x.el (string-slice): Remove.
---
doc/lispref/strings.texi | 11 -----------
etc/NEWS | 2 +-
lisp/emacs-lisp/shortdoc.el | 3 ---
lisp/emacs-lisp/subr-x.el | 13 -------------
test/lisp/emacs-lisp/subr-x-tests.el | 8 --------
5 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index ef848ac..19b9147 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -381,17 +381,6 @@ The default value of @var{separators} for
@code{split-string}. Its
usual value is @w{@code{"[ \f\t\n\r\v]+"}}.
@end defvar
-@defun string-slice string regexp
-Split @var{string} into a list of strings on @var{regexp} boundaries.
-As opposed to @code{split-string}, the boundaries are included in the
-result set:
-
-@example
-(string-slice " two words " " +")
- @result{} (" two" " words" " ")
-@end example
-@end defun
-
@defun string-clean-whitespace string
Clean up the whitespace in @var{string} by collapsing stretches of
whitespace to a single space character, as well as removing all
diff --git a/etc/NEWS b/etc/NEWS
index b155ff9..3a01022 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1467,7 +1467,7 @@ This can be set to nil to inhibit hiding passwords in
.authinfo files.
+++
*** A number of new string manipulation functions have been added.
'string-clean-whitespace', 'string-fill', 'string-limit',
-'string-lines', 'string-pad', 'string-chop-newline' and 'string-slice'.
+'string-lines', 'string-pad' and 'string-chop-newline'.
+++
*** New variable 'current-minibuffer-command'.
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index 0067495..6184655 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -154,9 +154,6 @@ There can be any number of :example/:result elements."
:eval (split-string "foo bar")
:eval (split-string "|foo|bar|" "|")
:eval (split-string "|foo|bar|" "|" t))
- (string-slice
- :eval (string-slice "foo-bar" "-")
- :eval (string-slice "foo-bar--zot-" "-+"))
(string-lines
:eval (string-lines "foo\n\nbar")
:eval (string-lines "foo\n\nbar" t))
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 7e17a34..dc5840a 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -310,19 +310,6 @@ than this function."
If OMIT-NULLS, empty lines will be removed from the results."
(split-string string "\n" omit-nulls))
-(defun string-slice (string regexp)
- "Split STRING at REGEXP boundaries and return a list of slices.
-The boundaries that match REGEXP are included in the result.
-
-Also see `split-string'."
- (if (zerop (length string))
- (list "")
- (let ((i (string-match-p regexp string 1)))
- (if i
- (cons (substring string 0 i)
- (string-slice (substring string i) regexp))
- (list string)))))
-
(defun string-pad (string length &optional padding start)
"Pad STRING to LENGTH using PADDING.
If PADDING is nil, the space character is used. If not nil, it
diff --git a/test/lisp/emacs-lisp/subr-x-tests.el
b/test/lisp/emacs-lisp/subr-x-tests.el
index 3fc5f1d..2ae492e 100644
--- a/test/lisp/emacs-lisp/subr-x-tests.el
+++ b/test/lisp/emacs-lisp/subr-x-tests.el
@@ -604,14 +604,6 @@
(should (equal (string-lines "foo") '("foo")))
(should (equal (string-lines "foo \nbar") '("foo " "bar"))))
-(ert-deftest subr-string-slice ()
- (should (equal (string-slice "foo-bar" "-") '("foo" "-bar")))
- (should (equal (string-slice "foo-bar-" "-") '("foo" "-bar" "-")))
- (should (equal (string-slice "-foo-bar-" "-") '("-foo" "-bar" "-")))
- (should (equal (string-slice "ooo" "lala") '("ooo")))
- (should (equal (string-slice "foo bar" "\\b") '("foo" " " "bar" "")))
- (should (equal (string-slice "foo bar" "\\b\\|a") '("foo" " " "b" "ar" ""))))
-
(ert-deftest subr-string-pad ()
(should (equal (string-pad "foo" 5) "foo "))
(should (equal (string-pad "foo" 5 ?-) "foo--"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 269cec1: Remove `string-slice' -- it's not very well defined,
Lars Ingebrigtsen <=