[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fix `undo-recent-deprecations` to reload l3deprecation.def (54f59e2c1)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/54f59e2c165cfd636ae1780f54223d7e9b416f07

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

commit 54f59e2c165cfd636ae1780f54223d7e9b416f07
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Tue Feb 18 11:26:32 2020 -0300

    Fix `undo-recent-deprecations` to reload l3deprecation.def


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

54f59e2c165cfd636ae1780f54223d7e9b416f07
 l3kernel/CHANGELOG.md                   |  3 +++
 l3kernel/expl3.dtx                      |  2 +-
 l3kernel/l3deprecation.dtx              |  8 ++++++--
 l3kernel/testfiles/m3deprecation004.lvt | 32 ++++++++++++++++++++++++++++++++
 l3kernel/testfiles/m3deprecation004.tlg | 17 +++++++++++++++++
 5 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 661b9a9da..c19c7f74e 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- `undo-recent-deprecations` would not reload the deprecation code
+
 ## [2020-02-14]
 
 ### Fixed
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 761cfbf20..7c9d9f8e8 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1274,8 +1274,8 @@
       } ,
     undo-recent-deprecations .code:n =
       {
-        \sys_load_deprecation:
         \bool_gset_true:N \g__kernel_deprecation_undo_recent_bool
+        \sys_load_deprecation:
       }
   }
 %    \end{macrocode}
diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index 315323673..2c374b375 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -558,6 +558,10 @@
 % \subsection{Loading the patches}
 %
 % When loaded first, the patches are simply read here.
+% Here the deprecation code is loaded with the lower-level |\__kernel_...|
+% macro because we don't want it to flip the \cs{g__sys_deprecation_bool}
+% boolean, so that the deprecation code can be re-loaded later (when using
+% \texttt{undo-recent-deprecations}).
 %
 %    \begin{macrocode}
 \group_begin:
@@ -575,7 +579,7 @@
   }
 \cs_gset_protected:Npn \__kernel_sys_configuration_load:n #1
   { \file_input:n { #1 .def } }
-\sys_load_deprecation:
+\__kernel_sys_configuration_load:n { l3deprecation }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1060,7 +1064,7 @@
 % \begin{macro}[EXP, deprecated = 2021-07-01]{\c_term_ior}
 %    \begin{macrocode}
 \__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { -1 }
-\cs_new_protected:Npn \c_term_ior { -1 \scan_stop: }
+\cs_gset_protected:Npn \c_term_ior { -1 \scan_stop: }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/testfiles/m3deprecation004.lvt b/l3kernel/testfiles/m3deprecation004.lvt
new file mode 100644
index 000000000..38b45b929
--- /dev/null
+++ b/l3kernel/testfiles/m3deprecation004.lvt
@@ -0,0 +1,32 @@
+%
+% Copyright (C) 2020 The LaTeX3 Project
+%
+\input{regression-test}
+
+\RequirePackage[check-declarations,log-functions]{expl3}
+
+\START
+\AUTHOR{Phelype Oleinik}
+
+\ExplSyntaxOn
+% \bool_gset_false:N \g__sys_deprecation_bool
+% \cs_undefine:N \c_term_ior
+% This should raise a deprecation error (within the 6-month grace period)
+\msg_term:n
+
+% Trick LaTeX into loading expl3.sty again
+\cs_undefine:c { ver at expl3.sty }
+\cs_undefine:N \l__expl_options_clist
+% \bool_gset_true:N \g__kernel_deprecation_undo_recent_bool
+\ExplSyntaxOff
+
+\OMIT % now with undo-recent-deprecations
+\RequirePackage[check-declarations,log-functions,undo-recent-deprecations]{expl3}
+\TIMO
+
+\ExplSyntaxOn
+% And now this should work
+\msg_term:n { ABC }
+\ExplSyntaxOff
+
+\END
diff --git a/l3kernel/testfiles/m3deprecation004.tlg b/l3kernel/testfiles/m3deprecation004.tlg
new file mode 100644
index 000000000..bd258235f
--- /dev/null
+++ b/l3kernel/testfiles/m3deprecation004.tlg
@@ -0,0 +1,17 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Phelype Oleinik
+! LaTeX3 Error: '\msg_term:n' deprecated on ....-..-... Use '\iow_term:n '.
+(LaTeX3)        For 6 months after that date one can restore a deprecated
+(LaTeX3)        command by loading the expl3 package with the option
+(LaTeX3)        'undo-recent-deprecations'.
+Type <return> to continue.
+ ...                                              
+l. ...\msg_term:n
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
+LaTeX3 Warning: '\msg_term:n' deprecated on ....-..-... Use '\iow_term:n '.
+*************************************************
+* ABC
+*************************************************