Second attempt at 8f99cde

If the first item is a braced group, more tokens are returned so a single \exp_not:N is not enough
latex3 · Mar 18, 2022 · b317f9c · b317f9c
1 parent 8f99cde
commit b317f9c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
@@ -4119,10 +4119,7 @@
     \exp_args:Ne \str_case_e:nnF
       {
         \exp_args:Nf \tl_if_empty:nT { \cs_argument_spec:N #1 }
-          {
-            \token_if_macro:NT #1
-              { \exp_not:N \exp_not:N \exp_not:e { \tl_head:N #1 } }
-          }
+          { \exp_not:N \exp_not:n { \exp_not:e { \tl_head:N #1 } } }
       }
       {
         { \exp_not:N \@@_start:nNNnnn } {#2}

diff --git a/base/testfiles/github-0795.lvt b/base/testfiles/github-0795.lvt
@@ -1,8 +1,12 @@
 \input test2e
 \START
 \def\test{\typeout{test}\fi}
+\def\testx{{\typeout{test x}\fi}}
 \AddToHook{cmd/test/after}{\typeout{hello}}
+\AddToHook{cmd/testx/after}{\typeout{hello x}}
 \@kernel@after@begindocument
 \if11 % \fi comes from \test
 \test
+\if11 % \fi comes from \testx
+\testx
 \END
diff --git a/base/testfiles/github-0795.tlg b/base/testfiles/github-0795.tlg
@@ -2,3 +2,5 @@ This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
 test
 hello
+test x
+hello x