[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Merge pull request #466 from latex3/hotfix/gh463 (ac4e1765)

[GitHub]

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

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

commit ac4e17650b79f51e956ba5c701462018d0d211ec
Merge: 3ec488b6 aa6deab6
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jan 7 17:56:53 2021 +0100

    Merge pull request #466 from latex3/hotfix/gh463
    
    Hotfix/gh463


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

ac4e17650b79f51e956ba5c701462018d0d211ec
 base/changes.txt                                   |    8 +
 base/ltfilehook.dtx                                |   16 +-
 base/lthooks.dtx                                   |   85 +-
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |    2 +
 .../tlb-latexrelease-rollback-003-often.tlg        |    2 +
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |    2 +
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |    1 +
 base/testfiles/tlb-rollback-004-often.tlg          |    1 +
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |    1 +
 base/testfiles/tlb-syntonly-001.luatex.tlg         |    2 +-
 texmf/tex/latex/l3kernel/expl3-code.tex            | 2425 ++++++++++++++------
 texmf/tex/latex/l3kernel/expl3-generic.tex         |   11 +-
 texmf/tex/latex/l3kernel/expl3.ltx                 |   13 +-
 texmf/tex/latex/l3kernel/expl3.lua                 |   11 +-
 texmf/tex/latex/l3kernel/expl3.sty                 |    4 +-
 texmf/tex/latex/l3kernel/l3debug.def               |   20 +-
 texmf/tex/latex/l3kernel/l3deprecation.def         |    4 +-
 texmf/tex/latex/l3kernel/l3doc.cls                 |   30 +-
 texmf/tex/latex/l3packages/xparse/xparse.ltx       |    2 +-
 texmf/tex/latex/l3packages/xparse/xparse.sty       |    4 +-
 20 files changed, 1892 insertions(+), 752 deletions(-)

diff --cc base/changes.txt
index 09e4082d,1b5740e6..26936948
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -10,16 -10,15 +10,24 @@@ are not part of the distribution
  All changes above are only part of the development branch for the next release.
  ================================================================================
  
+ 2021-01-07  Phelype Oleinik  <phelype.oleinik at latex-project.org>
+ 
+ 	* ltfilehook.dtx:
+ 	Undefine \@expl@@@filehook at file@pop@@ to avoid error when rolling back (gh/463).
+ 
+ 	* lthooks.dtx:
+ 	Modified internal copies of l3tl commands to avoid errors with l3debug (gh/463).
+ 
  #########################
 +# 2020-10-01 PL 4 Release
 +#########################
 +
 +2020-12-03  Joseph Wright  <Joseph.Wright at latex-project.org>
 +
 +        * usrguide3.tex
 +          New file to cover creation of document commands
 +
 +#########################
  # 2020-10-01 PL 3 Release
  #########################