1 files changed, 15 insertions, 4 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index 3c90cc81a3e..a24e520f458 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
 %
 %<*driver|generic|package|2ekernel>
 %</driver|generic|package|2ekernel>
-\def\ExplFileDate{2020-05-05}%
+\def\ExplFileDate{2020-05-11}%
 %<*driver>
 \documentclass[full]{l3doc}
 \usepackage{graphicx}
@@ -51,7 +51,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-05}
+% \date{Released 2020-05-11}
 %
 % \maketitle
 %
@@ -1334,6 +1334,17 @@
   { \sys_everyjob: }
 %    \end{macrocode}
 %
+% \begin{variable}{\s_@@_stop}
+%   Internal scan marks. This code has to be reload-safe, so this one
+%   has to be guarded with \cs{if_cs_exist:N} (\cs{cs_if_exist:NF}) wouldn't
+%   do because it returns false for control sequences equal to \cs{scan_stop:}.
+%    \begin{macrocode}
+\reverse_if:N \if_cs_exist:N \s_@@_stop
+  \scan_new:N \s_@@_stop
+\fi:
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\@pushfilename, \@popfilename}
 % \begin{macro}{\@@_status_pop:w}
 %   The idea here is to use \LaTeXe{}'s \tn{@pushfilename} and
@@ -1372,14 +1383,14 @@
     \__kernel_file_input_pop:
     \tl_if_empty:NTF \l_@@_status_stack_tl
       { \ExplSyntaxOff }
-      { \exp_after:wN \@@_status_pop:w \l_@@_status_stack_tl \q_stop }
+      { \exp_after:wN \@@_status_pop:w \l_@@_status_stack_tl \s_@@_stop }
   }
 %    \end{macrocode}
 %   The pop auxiliary function removes the first item from the stack,
 %   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_gset_protected:Npn \@@_status_pop:w #1#2 \q_stop
+\cs_gset_protected:Npn \@@_status_pop:w #1#2 \s_@@_stop
   {
     \tl_set:Nn \l_@@_status_stack_tl {#2}
     \int_if_odd:nTF {#1}