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

diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index da51e81dbe7dd1eff72ed96afe34639c31c41efd..70951f35d5d04f3c0e567394ebf64ffb64fd6284 100644 (file)
--- 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)