[latex3-commits] [git/LaTeX3-latex3-latex3] regex-callout: Fix merge problem (3e29d153f)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : regex-callout
Link       : https://github.com/latex3/latex3/commit/3e29d153f7ecdb963afede6707cea4feb1ce8846

>---------------------------------------------------------------

commit 3e29d153f7ecdb963afede6707cea4feb1ce8846
Author: Bruno Le Floch <blflatex at gmail.com>
Date:   Sat May 15 19:25:34 2021 +0200

    Fix merge problem


>---------------------------------------------------------------

3e29d153f7ecdb963afede6707cea4feb1ce8846
 l3kernel/l3regex.dtx              |  2 +-
 l3kernel/testfiles/m3regex011.tlg | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index f2ce3cbc8..d1afb0c79 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -3524,7 +3524,7 @@
         \@@_compile_u_loop:NN
       }
       {
-        \__kernel_msg_error:nn { regex } { missing-lbrace }
+        \__kernel_msg_error:nnx { regex } { missing-lbrace }
           { \iow_char:N \\u }
         \token_if_eq_meaning:NNTF #1 \@@_compile_ur_end:
           { \@@_compile_raw:N u \@@_compile_raw:N r }
diff --git a/l3kernel/testfiles/m3regex011.tlg b/l3kernel/testfiles/m3regex011.tlg
index 982be651c..4c402d71c 100644
--- a/l3kernel/testfiles/m3regex011.tlg
+++ b/l3kernel/testfiles/m3regex011.tlg
@@ -46,13 +46,13 @@ LaTeX3 Warning: Extra right parenthesis ignored in regular expression.
 +-branch
   Match
     categories L, class
-      char code 40
-  char code 63
-  char code 67
-  char code 123
-  char code 125
-  char code 41
-  char code 89.
+      char code 40 (()
+  char code 63 (?)
+  char code 67 (C)
+  char code 123 ({)
+  char code 125 (})
+  char code 41 ())
+  char code 89 (Y).
 <recently read> }
 l. ...  }
 ============================================================