[latex3-commits] [git/LaTeX3-latex3-latex2e] gh386: Ensure the loading doesn't silently fail (13d67758)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh386
Link       : https://github.com/latex3/latex2e/commit/13d67758b24d487bf4b7623dd04d2db567936ce5

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

commit 13d67758b24d487bf4b7623dd04d2db567936ce5
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Mon Sep 7 10:23:51 2020 -0300

    Ensure the loading doesn't silently fail
    
    Plus \space -> \c_space_tl


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

13d67758b24d487bf4b7623dd04d2db567936ce5
 base/ltclass.dtx    | 4 +++-
 base/ltfilehook.dtx | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index c9707765..43b979f9 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -1844,7 +1844,9 @@
 %    Now actually load the file (at this point we are certain it exists,
 %    but use \cs{InputIfFileExists} so that file hooks are executed):
 %    \begin{macrocode}
-    \InputIfFileExists{\@currpkg at reqd}{}{}%
+    \InputIfFileExists{\@currpkg at reqd}{}%
+      {\@latex at error
+        {The \@cls at pkg\space\@currpkg at reqd\space failed to load.}\@ehd}%
 %-----------------------------------------
 %    \end{macrocode}
 %    In older versions of the code |\@unprocessedoptions| would
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index 3e3ee442..7f112b86 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -1434,7 +1434,7 @@
 %   If there was a file replacement, show that as well:
 %    \begin{macrocode}
         \str_if_eq:NNF \CurrentFileUsed \CurrentFile
-          { ~ ( \CurrentFile \space requested ) }
+          { ~ ( \CurrentFile \c_space_tl requested ) }
         \iow_newline:
       }
     \str_if_eq:nnT {#1} {STOP} { \int_gdecr:N \g_@@_nesting_level_int }