[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Merge branch 'hotfix/gh464' (3ee45f0c)

[Frank Mittelbach]

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

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

commit 3ee45f0cde400c6479b2608becc26c1c3c36c265
Merge: ac4e1765 bbf9e8a0
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jan 7 18:12:31 2021 +0100

    Merge branch 'hotfix/gh464'
    
    # Conflicts:
    #       base/changes.txt


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

3ee45f0cde400c6479b2608becc26c1c3c36c265
 base/changes.txt                                   | 16 ++++-
 base/ltfilehook.dtx                                | 73 +++++++++++-----------
 base/lthooks.dtx                                   | 17 +++--
 .../{filehook-002.lvt => github-0464.lvt}          | 21 +++----
 .../testfiles-lthooks/github-0464.tlg              |  3 +-
 5 files changed, 74 insertions(+), 56 deletions(-)

diff --cc base/changes.txt
index 26936948,2da5424a..e86d2874
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -10,23 -10,14 +10,33 @@@ are not part of the distribution
  All changes above are only part of the development branch for the next release.
  ================================================================================
  
++
++#########################
++# 2020-10-01 PL 4 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-18  Phelype Oleinik  <phelype.oleinik at latex-project.org>
+ 
+ 	* lthooks.dtx:
+ 	Preserve trailing slash in file hook name if the file name is empty (gh/464).
+ 
+ 	* ltfilehook.dtx:
+ 	Restore \CurrentFile(Path)(Used) after the file is input (gh/464).
  
 +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
  #########################