[latex3-commits] [git/LaTeX3-latex3-latex3] LaTeX2020: Pre-loader should not parse \@currnamestack (32d6ac2ce)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : LaTeX2020
Link       : https://github.com/latex3/latex3/commit/32d6ac2ce5849b63e6deda70bb6a93b7b00621fb

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

commit 32d6ac2ce5849b63e6deda70bb6a93b7b00621fb
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Oct 3 11:29:10 2019 +0100

    Pre-loader should not parse \@currnamestack


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

32d6ac2ce5849b63e6deda70bb6a93b7b00621fb
 l3kernel/l3file.dtx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index cea19957d..7e78c3357 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2278,7 +2278,8 @@
 %   mode we can recover the information from the details held by
 %   \LaTeXe{} (we must be in the preamble and loaded using \tn{usepackage}
 %   or \tn{RequirePackage}). As \LaTeXe{} doesn't store directory and
-%   name separately, we stick to the same convention here.
+%   name separately, we stick to the same convention here. In pre-loading,
+%   \tn{@currnamestack} is empty so is skipped.
 %    \begin{macrocode}
 \seq_new:N \g_@@_stack_seq
 %<*package>
@@ -2301,7 +2302,10 @@
         }
     }
   \cs_if_exist:NT \@currnamestack
-    { \exp_after:wN \@@_tmp:w \@currnamestack }
+    {
+      \tl_if_empty:NF \@currnamestack
+        { \exp_after:wN \@@_tmp:w \@currnamestack }
+    }
 \group_end:
 %</package>
 %    \end{macrocode}