[latex3-commits] [git/LaTeX3-latex3-latex2e] gh198: fix for #198 (92acad48)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh198
Link       : https://github.com/latex3/latex2e/commit/92acad48601d19d4be320fb64dde29a5868934c9

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

commit 92acad48601d19d4be320fb64dde29a5868934c9
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Oct 18 16:34:43 2019 +0200

    fix for #198


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

92acad48601d19d4be320fb64dde29a5868934c9
 base/changes.txt      |  5 +++++
 base/doc/ltnews31.tex |  1 +
 base/ltclass.dtx      | 10 ++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 8dc09021..37ec2add 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2019-10-18  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltclass.dtx (section{Implementation}): Initialize
+	\...-h@@k only when loading the package or class (gh/198)
+
 #########################
 # 2019-10-01 PL 1 Release
 #########################
diff --git a/base/doc/ltnews31.tex b/base/doc/ltnews31.tex
index 8ada8f03..8e4162b2 100644
--- a/base/doc/ltnews31.tex
+++ b/base/doc/ltnews31.tex
@@ -201,6 +201,7 @@ this capability.
 
 \section{Other changes to the \LaTeX{} kernel}
 
+\emph{fixed gh198}
 
         
 \section{Changes to packages in the \pkg{tools} category}
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index 83aacf8d..1e70a923 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2019/10/07 v1.3c LaTeX Kernel (Class & Package Interface)]
+             [2019/10/18 v1.3d LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -1429,12 +1429,13 @@
 %         {Made the initial version [] not [\cs{@unknownversion}]}
 % \changes{v0.2m}{1993/12/07}
 %         {Reset \cs{CurrentOption}}
+% \changes{v1.3d}{2019/10/18}{Initialize \cs{...-h@@k} only when loading
+%                             the package or class (gh/198)}
 %    \begin{macrocode}
 \def\@onefilewithoptions#1[#2][#3]#4{%
   \@pushfilename
   \xdef\@currname{#1}%
   \global\let\@currext#4%
-  \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
   \let\CurrentOption\@empty
   \@reset at ptions
   \makeatletter
@@ -1470,6 +1471,11 @@
 %    \begin{macrocode}
        \global\expandafter
        \let\csname ver@\@currname.\@currext\endcsname\@empty
+%    \end{macrocode}
+%    We initialize \cs{...-h@@k} here and only if we load the file so that it
+%    remains undefined otherwise.
+%    \begin{macrocode}
+       \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
        \InputIfFileExists
          {\@currname.\@currext}%
          {}%