From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 9 Aug 2022 18:29:27 +0000 (+0200)
Subject: * lisp/nxml/rng-util.el (rng-collapse-space): Simplify.
X-Git-Tag: emacs-29.0.90~1447^2~269
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=caabc5a4ab584e00417d3d1f9a2bf0ee9052b092;p=emacs.git

* lisp/nxml/rng-util.el (rng-collapse-space): Simplify.
---

diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index da51e81dbe7..70951f35d5d 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -72,13 +72,8 @@ LIST is not modified."
 			    t))
 
 (defun rng-collapse-space (string)
-  (setq string
-	(replace-regexp-in-string "[ \t\r\n]+" " " string t t))
-  (when (string-match "\\` " string)
-    (setq string (substring string 1)))
-  (when (string-match " \\'" string)
-    (setq string (substring string 0 -1)))
-  string)
+  (string-trim
+   (replace-regexp-in-string "[ \t\r\n]+" " " string t t)))
 
 (define-error 'rng-error nil)