[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/compat 9ecaf46e15 09/16: Restore explicit versions of s
From: |
ELPA Syncer |
Subject: |
[elpa] externals/compat 9ecaf46e15 09/16: Restore explicit versions of string-trim |
Date: |
Wed, 4 Jan 2023 07:57:27 -0500 (EST) |
branch: externals/compat
commit 9ecaf46e1513e679738bdc65c740b0794cff46b8
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Restore explicit versions of string-trim
---
compat-26.el | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/compat-26.el b/compat-26.el
index 987da44744..549710c0d1 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -179,6 +179,8 @@ from the absolute start of the buffer, disregarding the
narrowing."
"Trim STRING of leading string matching REGEXP.
REGEXP defaults to \"[ \\t\\n\\r]+\"."
+ :realname compat--internal-string-trim-left
+ :explicit t
(if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string)
(substring string (match-end 0))
string))
@@ -187,6 +189,8 @@ REGEXP defaults to \"[ \\t\\n\\r]+\"."
"Trim STRING of trailing string matching REGEXP.
REGEXP defaults to \"[ \\t\\n\\r]+\"."
+ :realname compat--internal-string-trim-right
+ :explicit t
(let ((i (string-match-p
(concat "\\(?:" (or regexp "[ \t\n\r]+") "\\)\\'")
string)))
@@ -196,8 +200,12 @@ REGEXP defaults to \"[ \\t\\n\\r]+\"."
"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
+ :explicit t
+ ;; `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--internal-string-trim-left
+ (compat--internal-string-trim-right
string
trim-right)
trim-left))
- [elpa] externals/compat updated (3ee973db10 -> 0bb4709d83), ELPA Syncer, 2023/01/04
- [elpa] externals/compat 601387077a 04/16: Always require subr-x at compile time, ELPA Syncer, 2023/01/04
- [elpa] externals/compat 9ecaf46e15 09/16: Restore explicit versions of string-trim,
ELPA Syncer <=
- [elpa] externals/compat dab2ec091d 01/16: Restore tests, ELPA Syncer, 2023/01/04
- [elpa] externals/compat de7346396a 05/16: Add compat-feature macro, ELPA Syncer, 2023/01/04
- [elpa] externals/compat d18955c1be 07/16: Remove comments, ELPA Syncer, 2023/01/04
- [elpa] externals/compat 8ebf7984ce 06/16: Revert "Add compat-feature macro", ELPA Syncer, 2023/01/04
- [elpa] externals/compat 7737bb9d56 08/16: Run all checks at compile time, ELPA Syncer, 2023/01/04
- [elpa] externals/compat 31810cd4d9 10/16: Add :feature, ELPA Syncer, 2023/01/04
- [elpa] externals/compat e8de246d40 14/16: Update manual, ELPA Syncer, 2023/01/04
- [elpa] externals/compat 71f9648cdf 03/16: Specify features, ELPA Syncer, 2023/01/04
- [elpa] externals/compat 7aa705b65e 02/16: Require features at compile time, ELPA Syncer, 2023/01/04
- [elpa] externals/compat ce86316661 11/16: Restore tests, ELPA Syncer, 2023/01/04