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

Fix previous replace-in-string rewrite

Browse source 
* lisp/subr.el (replace-in-string): Fix logic errors in previous
patch.
This commit is contained in:
Lars Ingebrigtsen 2020-09-25 02:07:05 +02:00
parent 7f9ad5980c
commit 09adf92644
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/subr.el
View file

@ -4439,8 +4439,8 @@ Unless optional argument INPLACE is non-nil, return a new string."
(unless (= start pos)
(push (substring instring start pos) result))
(push tostring result)
(setq start (+ start (length fromstring))))
(unless (= start pos)
(setq start (+ pos (length fromstring))))
(unless (= start (length instring))
(push (substring instring start pos) result))
(apply #'concat (nreverse result))))

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

@ -462,9 +462,9 @@ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350."
"foozotbar"))
(should (equal (replace-in-string "\377" "x" "a\377b")
"axxb"))
"axb"))
(should (equal (replace-in-string "\377" "x" "a\377ø")
"axxø")))
"axø")))
(provide 'subr-tests)
;;; subr-tests.el ends here