[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Revert "Fix for #414 in firstaid" (3c535c58)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/3c535c58dd3b89b670bfb7bb444dcba5e14b0fb2

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

commit 3c535c58dd3b89b670bfb7bb444dcba5e14b0fb2
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Tue Oct 20 18:42:46 2020 -0300

    Revert "Fix for #414 in firstaid"
    
    This reverts commit a893f796548a2fcdd9edf8aad1d57a2ffbc51f24.


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

3c535c58dd3b89b670bfb7bb444dcba5e14b0fb2
 required/firstaid/changes.txt                      |  5 ---
 .../latex2e-first-aid-for-external-files.dtx       | 41 ++--------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index 1b95383a..75067562 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,8 +1,3 @@
-2020-10-18  Phelype Oleinik  <phelype.oleinik at latex-project.org>
-
-	* latex2e-first-aid-for-external-files.dtx:
-	Fix for gh414 to be taken out later when it moves to the kernel.
-
 2020-10-13  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx:
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index 71696b45..55e0d01e 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -110,8 +110,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\LaTeXFirstAidDate{2020/10/18}
-\def\LaTeXFirstAidVersion{v1.0g}
+\def\LaTeXFirstAidDate{2020/10/13}
+\def\LaTeXFirstAidVersion{v1.0f}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -435,43 +435,6 @@
 %    \end{macrocode}
 %
 %
-%
-%    This is fixing GitHub issue 414.
-%    \begin{macrocode}
-\def\@pass at ptions#1#2#3{%
-  \@expl@@@filehook at set@curr at file@@nNN
-    {\@expl@@@filehook at resolve@file at subst@@w #3.#1\@nil}%
-      \reserved at a\reserved at b
-  \expandafter\xdef\csname opt@\reserved at a\endcsname{%
-    \@ifundefined{opt@\reserved at a}\@empty
-      {\csname opt@\reserved at a\endcsname,}%
-    \zap at space#2 \@empty}}
-\def\@filehook at set@CurrentFile{%
-  \@expl@@@filehook at set@curr at file@@nNN{\@curr at file}%
-    \CurrentFileUsed\CurrentFilePathUsed
-  \ifx\@curr at file@reqd\@curr at file
-    \let\CurrentFile\CurrentFileUsed
-    \let\CurrentFilePath\CurrentFilePathUsed
-  \else
-    \@expl@@@filehook at set@curr at file@@nNN{\@curr at file@reqd}%
-      \CurrentFile\CurrentFilePath
-  \fi}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\ExplSyntaxOn
-\cs_gset_protected:Npn \__filehook_set_curr_file:nNN #1
-  {
-    \exp_args:Nf \__filehook_file_parse_full_name:nN {#1}
-      \__filehook_set_curr_file_assign:nnnNN
-  }
-\cs_gset_eq:NN \@expl@@@filehook at set@curr at file@@nNN
-               \__filehook_set_curr_file:nNN
-\cs_undefine:N \__filehook_set_curr_file:N
-\cs_undefine:N \@expl@@@filehook at set@curr at file@@N
-\ExplSyntaxOff
-%    \end{macrocode}
-%
 %    \begin{macrocode}
 %</kernel>
 %    \end{macrocode}