summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-12-21 20:18:57 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2020-12-21 20:18:57 +0100
commitcf2e8321850f81d9eb0ebc23a4887f12dc3dbfac (patch)
treefcfeb0635d9e0d52b6ff9af3ee64e1c66e5d5721 /lisp/emacs-lisp
parentb3dec3176673fa99e57e3916b36ea4367d47c0fa (diff)
downloademacs-cf2e8321850f81d9eb0ebc23a4887f12dc3dbfac.tar.gz
emacs-cf2e8321850f81d9eb0ebc23a4887f12dc3dbfac.tar.bz2
emacs-cf2e8321850f81d9eb0ebc23a4887f12dc3dbfac.zip
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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/shortdoc.el6
-rw-r--r--lisp/emacs-lisp/subr-x.el2
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index 3e1476adfc1..df31b0aaf1f 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -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))
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 250ba6e6fa2..db7e75dfd2b 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -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)