Simplify whitespace stripping in shr-expand-url

* lisp/net/shr.el (shr-expand-url): Simplify whitespace stripping.

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bd16a779593208da1558420c9dd4b0f73306debf..676f609c24be2c763658528b3811751d959a9c45 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -857,11 +857,9 @@ size, and full-buffer size."
          shr-base))
   (when (zerop (length url))
     (setq url nil))
-  ;; Strip leading/trailing whitespace
-  (and url (string-match "\\`\\s-+" url)
-       (setq url (substring url (match-end 0))))
-  (and url (string-match "\\s-+\\'" url)
-       (setq url (substring url 0 (match-beginning 0))))
+  ;; Strip leading/trailing whitespace.
+  (when url
+    (setq url (string-trim url)))
   (cond ((zerop (length url))
          (nth 3 base))
         ((or (not base)