[latex3-commits] [git/LaTeX3-latex3-latex3] master: Make expl3.ltx reload-safe (38ef50485)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/38ef504856265416dc15986c2d6c4335815900be

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

commit 38ef504856265416dc15986c2d6c4335815900be
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Mon Mar 2 22:56:59 2020 -0300

    Make expl3.ltx reload-safe
    
    Related: latex3/latex2e#295


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

38ef504856265416dc15986c2d6c4335815900be
 l3kernel/expl3.dtx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 3f2f1c78b..42c3d1077 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1196,11 +1196,9 @@
 % simply turn it on. We use \tn{@pushfilenameaux} as a marker: it's defined
 % a little later.
 %    \begin{macrocode}
-%<*!2ekernel>
 \ifdefined\@pushfilenameaux
   \ExplSyntaxOn
 \fi
-%</!2ekernel>
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1381,7 +1379,7 @@
 %   saves the rest of the stack and then does the test. The flag here
 %   is not a proper \texttt{bool}, so a low-level test is used.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_status_pop:w #1#2 \q_stop
+\cs_gset_protected:Npn \@@_status_pop:w #1#2 \q_stop
   {
     \tl_set:Nn \l_@@_status_stack_tl {#2}
     \int_if_odd:nTF {#1}
@@ -1397,8 +1395,11 @@
 %   already active, at the end of the package \cs{ExplSyntaxOff} can
 %   safely be called.
 %    \begin{macrocode}
-\tl_new:N \l_@@_status_stack_tl
-\tl_set:Nn \l_@@_status_stack_tl { 0 }
+\tl_if_exist:NF \l_@@_status_stack_tl
+  {
+    \tl_new:N \l_@@_status_stack_tl
+    \tl_set:Nn \l_@@_status_stack_tl { 0 }
+  }
 %    \end{macrocode}
 % \end{variable}
 %