[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: seems the \@reset at ptions in one place is needed for 209 compatibility mode fixed github-0356 test in case test dir is not cleared (9b1ec69d)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/9b1ec69dbb66454c5a0748a5c1cd0debfc3fcfd8

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

commit 9b1ec69dbb66454c5a0748a5c1cd0debfc3fcfd8
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sat Aug 29 17:42:31 2020 +0200

    seems the \@reset at ptions in one place is needed for 209 compatibility mode
    fixed github-0356 test in case test dir is not cleared


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

9b1ec69dbb66454c5a0748a5c1cd0debfc3fcfd8
 base/ltclass.dtx               | 19 +++++++------------
 base/testfiles/github-0356.lvt |  7 +++++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index ba7fd048..7b1dbc81 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -595,14 +595,6 @@
 %<latexrelease>    {\@currext}%
 %<latexrelease>    {\the\catcode`\@}%
 %<latexrelease>    \@currnamestack}}
-%<latexrelease>%\def\@pushfilename{%
-%<latexrelease>%  \@expl at push@filename@@
-%<latexrelease>%  \xdef\@currnamestack{%
-%<latexrelease>%    {\@currname}%
-%<latexrelease>%    {\@currext}%
-%<latexrelease>%    {\the\catcode`\@}%
-%<latexrelease>%    \@currnamestack}%
-%<latexrelease>%  \@expl at push@filename at aux@@}
 %<latexrelease>\EndIncludeInRelease
 \@onlypreamble\@pushfilename
 %    \end{macrocode}
@@ -624,8 +616,6 @@
 %<latexrelease>\IncludeInRelease{0000/00/00}{\@popfilename}%
 %<latexrelease>  {Add \@expl at push@filename@@ and \@expl at push@filename at aux@@}%
 %<latexrelease>\def\@popfilename{\expandafter\@p at pfilename\@currnamestack\@nil}
-%<latexrelease>%\def\@popfilename{\expandafter\@p at pfilename\@currnamestack\@nil
-%<latexrelease>%  \@expl at pop@filename@@}
 %<latexrelease>\EndIncludeInRelease
 \@onlypreamble\@popfilename
 %    \end{macrocode}
@@ -1702,7 +1692,13 @@
          \MessageBreak
          Try typing \space <return> \space to proceed.}}%
      \@firstofone}%
-    {%
+    {\makeatletter
+%    \end{macrocode}
+%    The next line seems to be necessary for 2.09 compatibility (the
+%    way the code is written there) This seems questionable and should be
+%    look at as in 2e it is definitely unnecessary at this point!
+%    \begin{macrocode}
+     \@reset at ptions
 %    \end{macrocode}
 %    First we take the \meta{name} and \meta{ext} given in the argument
 %    and check if the file exists, and issue an error otherwise asking
@@ -1786,7 +1782,6 @@
 \def\load at onefile@withoptions#1{%
   \let\CurrentOption\@empty
   \@reset at ptions
-  \makeatletter
 %    \end{macrocode}
 % Grab everything in a macro, so the parameter stack is popped before
 % any processing begins.
diff --git a/base/testfiles/github-0356.lvt b/base/testfiles/github-0356.lvt
index 51e5ae3a..aad2bc0a 100644
--- a/base/testfiles/github-0356.lvt
+++ b/base/testfiles/github-0356.lvt
@@ -1,9 +1,12 @@
 % Testfile for Github-iussue 0256
 %
-% This fie tests that \input{} loads a file called .tex instead iof
+% This fie tests that \input{} loads a file called .tex instead of
 % looking foer csnameendcsname.tex
 %
-\begin{filecontents}{.tex}
+% the test directory may contain already the official .tex file so we force the
+% writing:
+
+\begin{filecontents}[overwrite]{.tex}
 \typeout{File .tex loaded}
 \end{filecontents}
 \documentclass{minimal}