[elpa] externals/compat 8f64282 49/99: Use compatibility functions in string-trim definition

[ELPA Syncer]

branch: externals/compat
commit 8f6428254d90b24b4e1d694829332e8b31c24393
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Use compatibility functions in string-trim definition
---
 compat-26.1.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/compat-26.1.el b/compat-26.1.el
index 62d7b23..c8c6c9b 100644
--- a/compat-26.1.el
+++ b/compat-26.1.el
@@ -120,14 +120,15 @@ REGEXP defaults to  \"[ \\t\\n\\r]+\"."
             string)))
     (if i (substring string 0 i) string)))
 
-(declare-function string-trim-left nil (string &optional regexp))
-(declare-function string-trim-right nil (string &optional regexp))
 (compat-defun string-trim (string &optional trim-left trim-right)
   "Trim STRING of leading with and trailing matching TRIM-LEFT and TRIM-RIGHT.
 
 TRIM-LEFT and TRIM-RIGHT default to \"[ \\t\\n\\r]+\"."
-  (string-trim-left
-   (string-trim-right
+  ;; `string-trim-left' and `string-trim-right' were moved from subr-x
+  ;; to subr in Emacs 27, so to avoid loading subr-x we use the
+  ;; compatibility function here:
+  (compat--string-trim-left
+   (compat--string-trim-right
     string
     trim-right)
    trim-left))