[latex3-commits] [git/LaTeX3-latex3-latex2e] earlier-expl3: Load ltexpl at the end of ltdefns for now (5c52503b)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : earlier-expl3
Link       : https://github.com/latex3/latex2e/commit/5c52503b3f5a35694366287bd27197c37e760c61

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

commit 5c52503b3f5a35694366287bd27197c37e760c61
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Tue Jun 9 11:39:48 2020 -0300

    Load ltexpl at the end of ltdefns for now
    
    Some basic commands like \@gobble, \@firstoftwo, etc. are needed for package loading in expl3 and ltluatex


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

5c52503b3f5a35694366287bd27197c37e760c61
 base/ltdefns.dtx | 20 ++++++++++----------
 base/ltexpl.dtx  | 11 -----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/base/ltdefns.dtx b/base/ltdefns.dtx
index 3abd251e..b8bc07c6 100644
--- a/base/ltdefns.dtx
+++ b/base/ltdefns.dtx
@@ -101,16 +101,6 @@
 %<*2ekernel>
 %    \end{macrocode}
 %
-% \subsection{Loading further extensions}
-%
-% \changes{v1.5i}{2020-06-04}{Load \textsf{ltexpl} in \texttt{ltdefns}}
-% Simply load further code: it's deliberately separate.
-% This is done as soon as possible here in \texttt{ltdefns.dtx} so that
-% we have the extensions as soon as possible.
-%    \begin{macrocode}
-\input ltexpl.ltx
-%    \end{macrocode}
-%
 % \subsection{Initex initialisations}
 %
 % \task{???}{This section needs extension}
@@ -1726,6 +1716,16 @@
 %<*2ekernel>
 %    \end{macrocode}
 %
+% \subsection{Loading further extensions}
+%
+% \changes{v1.5i}{2020-06-04}{Load \textsf{ltexpl} in \texttt{ltdefns}}
+% Simply load further code: it's deliberately separate.
+% This is done as soon as possible here in \texttt{ltdefns.dtx} so that
+% we have the extensions available almost everywhere.
+%    \begin{macrocode}
+\input ltexpl.ltx
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</2ekernel>
 %    \end{macrocode}
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 87c2c8da..3f00f6fe 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -91,17 +91,6 @@
     \closein\@inputcheck
     \expandafter\@firstoftwo
   \fi}
-\long\def\@ifnextchar#1#2#3{%
-  \let\reserved at d=#1%
-  \def\reserved at a{#2}%
-  \def\reserved at b{#3}%
-  \futurelet\@let at token\@ifnch}
-\def\@ifnch{%
-  \ifx\@let at token\reserved at d
-    \expandafter\reserved at a
-  \else
-    \expandafter\reserved at b
-  \fi}
 %</2ekernel>
 %    \end{macrocode}
 %