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

Rename replace-in-string to string-replace

Browse source 
* doc/lispref/searching.texi (Search and Replace): Update.
* lisp/bindings.el (mode-line-position): Update callers.

* lisp/subr.el (string-replace): Rename from replace-in-string
since that clashes with XEmacs' replace-in-string which is
equivalent to the Emacs replace-regexp-in-string (bug#43598).
This commit is contained in:
Lars Ingebrigtsen 2020-09-27 00:24:50 +02:00
parent 13e75e620b
commit baf331e40c
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/lispref/searching.texi
View file

@ -2566,7 +2566,7 @@ replacement string. The match data at this point are the result
of matching @var{regexp} against a substring of @var{string}.
@end defun
@defun replace-in-string fromstring tostring instring
@defun string-replace fromstring tostring instring
This function copies @var{instring} and replaces any occurrences of
@var{fromstring} with @var{tostring}.
@end defun

2
etc/NEWS
View file

@ -1455,7 +1455,7 @@ return status is non-zero. 'process-lines-handling-status' has also
been added, and takes a callback to handle the return status.
+++
*** New function 'replace-in-string'.
*** New function 'string-replace'.
This function works along the line of 'replace-regexp-in-string', but
matching on strings instead of regexps, and does not change the global
match state.

4
lisp/bindings.el
View file

@ -493,7 +493,7 @@ mouse-1: Display Line and Column Mode Menu")))
,@mode-line-position--column-line-properties))
(10
(:propertize
(:eval (replace-in-string
(:eval (string-replace
"%c" "%C" (car mode-line-position-column-line-format)))
,@mode-line-position--column-line-properties)))
(6
@ -508,7 +508,7 @@ mouse-1: Display Line and Column Mode Menu")))
(,@mode-line-position--column-line-properties)))
(6
(:propertize
(:eval (replace-in-string
(:eval (string-replace
"%c" "%C" (car mode-line-position-column-format)))
,@mode-line-position--column-line-properties))))))
"Mode line construct for displaying the position in the buffer.

2
lisp/subr.el
View file

@ -4429,7 +4429,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
(aset newstr i tochar)))
newstr))
(defun replace-in-string (fromstring tostring instring)
(defun string-replace (fromstring tostring instring)
"Replace FROMSTRING with TOSTRING in INSTRING each time it occurs."
(declare (pure t))
(when (equal fromstring "")

26
test/lisp/subr-tests.el
View file

@ -440,33 +440,33 @@ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350."
(should-error (ignore-error foo
(read ""))))
(ert-deftest replace-in-string ()
(should (equal (replace-in-string "foo" "bar" "zot")
(ert-deftest string-replace ()
(should (equal (string-replace "foo" "bar" "zot")
"zot"))
(should (equal (replace-in-string "foo" "bar" "foozot")
(should (equal (string-replace "foo" "bar" "foozot")
"barzot"))
(should (equal (replace-in-string "foo" "bar" "barfoozot")
(should (equal (string-replace "foo" "bar" "barfoozot")
"barbarzot"))
(should (equal (replace-in-string "zot" "bar" "barfoozot")
(should (equal (string-replace "zot" "bar" "barfoozot")
"barfoobar"))
(should (equal (replace-in-string "z" "bar" "barfoozot")
(should (equal (string-replace "z" "bar" "barfoozot")
"barfoobarot"))
(should (equal (replace-in-string "zot" "bar" "zat")
(should (equal (string-replace "zot" "bar" "zat")
"zat"))
(should (equal (replace-in-string "azot" "bar" "zat")
(should (equal (string-replace "azot" "bar" "zat")
"zat"))
(should (equal (replace-in-string "azot" "bar" "azot")
(should (equal (string-replace "azot" "bar" "azot")
"bar"))
(should (equal (replace-in-string "azot" "bar" "foozotbar")
(should (equal (string-replace "azot" "bar" "foozotbar")
"foozotbar"))
(should (equal (replace-in-string "\377" "x" "a\377b")
(should (equal (string-replace "\377" "x" "a\377b")
"axb"))
(should (equal (replace-in-string "\377" "x" "a\377ø")
(should (equal (string-replace "\377" "x" "a\377ø")
"axø"))
(should-error (replace-in-string "" "x" "abc")))
(should-error (string-replace "" "x" "abc")))
(provide 'subr-tests)
;;; subr-tests.el ends here