branch: externals/compat
commit fa09ea09b63353756e3fa665df95f77a7bcfcc17
Author: Philip Kaludercic <phil...@posteo.net>
Commit: Philip Kaludercic <phil...@posteo.net>
Factor out multibyte regexp tests for string-search and -replace
---
compat-tests.el | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/compat-tests.el b/compat-tests.el
index 22b3414..2825dfd 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -211,7 +211,6 @@ the compatibility function."
(compat--should nil (make-string 1 255) "a\377ø")
(compat--should nil (make-string 1 255) "a\377a")
(compat--should 3 "fóo" "zotfóo")
- (compat--should 2 (string-to-multibyte "\377") "ab\377c")
(compat--should nil "\303" "aøb")
(compat--should nil "\270" "aøb")
(compat--should nil "ø" "\303\270")
@@ -252,10 +251,16 @@ the compatibility function."
(compat--should nil
(string-to-multibyte "\370")
(string-to-multibyte "\303\270"))
- (compat--should 2
- (string-to-multibyte "o\303\270")
- "foo\303\270")
- (compat--should 3 "\303\270" "foo\303\270")))
+ (compat--should 3 "\303\270" "foo\303\270")
+ (when (version<= "27" emacs-version)
+ ;; FIXME The commit a1f76adfb03c23bb4242928e8efe6193c301f0c1 in
+ ;; emacs.git fixes the behaviour of regular expressions matching
+ ;; raw bytes. The compatibility functions should updated to
+ ;; backport this behaviour.
+ (compat--should 2 (string-to-multibyte "\377") "ab\377c")
+ (compat--should 2
+ (string-to-multibyte "o\303\270")
+ "foo\303\270"))))
(ert-deftest compat-string-replace ()
"Check if `string-replace' was implemented correctly."
@@ -275,8 +280,14 @@ the compatibility function."
(compat--should "labarbarbarzot" "fo" "bar" "lafofofozot")
(compat--should "axb" "\377" "x" "a\377b")
(compat--should "axø" "\377" "x" "a\377ø")
- (compat--should "axb" (string-to-multibyte "\377") "x" "a\377b")
- (compat--should "axø" (string-to-multibyte "\377") "x" "a\377ø")
+ (when (version<= "27" emacs-version)
+ ;; FIXME The commit a1f76adfb03c23bb4242928e8efe6193c301f0c1
+ ;; in emacs.git fixes the behaviour of regular
+ ;; expressions matching raw bytes. The compatibility
+ ;; functions should updated to backport this
+ ;; behaviour.
+ (compat--should "axb" (string-to-multibyte "\377") "x" "a\377b")
+ (compat--should "axø" (string-to-multibyte "\377") "x" "a\377ø"))
(compat--should "ANAnas" "ana" "ANA" "ananas")
(compat--should "" "a" "" "")
(compat--should "" "a" "" "aaaaa")
