1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-18 18:05:07 +00:00

Rename slice-string to string-slice

* lisp/emacs-lisp/subr-x.el (string-slice): Rename from slice-string.
* doc/lispref/strings.texi (Creating Strings): Ditto.
This commit is contained in:
Lars Ingebrigtsen 2020-12-21 20:18:57 +01:00
parent b3dec31766
commit cf2e832185
5 changed files with 12 additions and 12 deletions

View File

@ -381,13 +381,13 @@ The default value of @var{separators} for @code{split-string}. Its
usual value is @w{@code{"[ \f\t\n\r\v]+"}}.
@end defvar
@defun slice-string string regexp
@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
(slice-string " two words " " +")
(string-slice " two words " " +")
@result{} (" two" " words" " ")
@end example
@end defun

View File

@ -1443,7 +1443,7 @@ that makes it a valid button.
+++
*** A number of new string manipulation functions have been added.
'string-clean-whitespace', 'string-fill', 'string-limit',
'string-limit', 'string-pad' and 'slice-string'.
'string-limit', 'string-pad' and 'string-slice'.
+++
*** New variable 'current-minibuffer-command'.

View File

@ -151,9 +151,9 @@ 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))
(slice-string
:eval (slice-string "foo-bar" "-")
:eval (slice-string "foo-bar--zot-" "-+"))
(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))

View File

@ -301,7 +301,7 @@ a substring consisitng of thelast LENGTH characters of STRING."
If OMIT-NULLS, empty lines will be removed from the results."
(split-string string "\n" omit-nulls))
(defun slice-string (string regexp)
(defun string-slice (string regexp)
"Split STRING at REGEXP boundaries and return a list of slices.
The boundaries that match REGEXP are not omitted from the results."
(let ((start-substring 0)

View File

@ -602,11 +602,11 @@
(should (equal (string-lines "foo") '("foo")))
(should (equal (string-lines "foo \nbar") '("foo " "bar"))))
(ert-deftest subr-slice-string ()
(should (equal (slice-string "foo-bar" "-") '("foo" "-bar")))
(should (equal (slice-string "foo-bar-" "-") '("foo" "-bar" "-")))
(should (equal (slice-string "-foo-bar-" "-") '("-foo" "-bar" "-")))
(should (equal (slice-string "ooo" "lala") '("ooo"))))
(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"))))
(ert-deftest subr-string-pad ()
(should (equal (string-pad "foo" 5) "foo "))