[latex3-commits] [git/LaTeX3-latex3-latex3] master: Allow repeated use of "undo-recent-deprecations" (e8cb98324)

[Joseph Wright]

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

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

commit e8cb98324aa2f0ee39811cd3426e9ec009e7895b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Nov 4 11:48:13 2019 +0000

    Allow repeated use of "undo-recent-deprecations"


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

e8cb98324aa2f0ee39811cd3426e9ec009e7895b
 l3kernel/CHANGELOG.md      | 1 +
 l3kernel/expl3.dtx         | 2 +-
 l3kernel/l3deprecation.dtx | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 977082625..400a736df 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -10,6 +10,7 @@ this project uses date-based 'snapshot' version identifiers.
 ### Fixed
 
 - Handling of repeated loading of a backend (issue #646)
+- Hanlding of repeated loading of deprecated functions
 
 ## [2019-10-28]
 
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index b2b0464bc..1602b1795 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1551,7 +1551,7 @@
 % \begin{macro}{\__kernel_sys_configuration_load:n}
 %   Very basic.
 %    \begin{macrocode}
-\cs_new_protected:Npn \__kernel_sys_configuration_load:n #1
+\cs_gset_protected:Npn \__kernel_sys_configuration_load:n #1
   {
     \group_begin:
     \cs_set_protected:Npn \ProvidesExplFile
diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index f3da72722..b5bc2a6c8 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -573,7 +573,9 @@
       { \exp_not:N \ProvidesFile {#1} [ #2~v#3~#4 ] }
       { \iow_log:x { File:~#1~#2~v#3~#4 } }
   }
-\file_input:n { l3deprecation.def }
+\cs_gset_protected:Npn \__kernel_sys_configuration_load:n #1
+  { \file_input:n { #1 .def } }
+\sys_load_deprecation:
 %    \end{macrocode}
 %
 %    \begin{macrocode}