[latex3-commits] [git/LaTeX3-latex3-xcolor] changekeyhandler: correct moving of patch (04d6d07)

[Ulrike Fischer]

Repository : https://github.com/latex3/xcolor
On branch  : changekeyhandler
Link       : https://github.com/latex3/xcolor/commit/04d6d0782e757abdb494b3334371c7e9ef1af45a

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

commit 04d6d0782e757abdb494b3334371c7e9ef1af45a
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun Jul 31 15:37:06 2022 +0200

    correct moving of patch


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

04d6d0782e757abdb494b3334371c7e9ef1af45a
 xcolor.dtx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/xcolor.dtx b/xcolor.dtx
index 4864648..ca3964e 100644
--- a/xcolor.dtx
+++ b/xcolor.dtx
@@ -4835,8 +4835,7 @@
 %    \end{macrocode}
 % |\@expl at xcolor@set@@nonn| prepares color for the l3color support.
 %    \begin{macrocode}
-\IfDocumentMetadataTF{}
- {\providecommand\@expl at xcolor@set@@nonn[4]{}}
+\providecommand\@expl at xcolor@set@@nonn[4]{}
 \def\XC at definec@lor[#1]#2[#3]#4#5%
  {\@expl at xcolor@set@@nonn{#2}{#4}{#5}{#1}%
   \begingroup
@@ -5007,8 +5006,12 @@
 \def\colorlet{\@testopt{\XC at colorlet}{}}
 %    \end{macrocode}
 % |\@expl at xcolor@set@@ne| prepares colors also for l3color.
-\IfDocumentMetadataTF{}
- {\providecommand\@expl at xcolor@set@@ne[2]{}}
+% As the old patch defined it with |\cs_new| we have to undefine it again temporarly.
+%    \begin{macrocode}
+\IfDocumentMetadataTF
+ {\@ifundefined{@expl at xcolor@set@@ne}{\AtEndOfPackage{\let\@expl at xcolor@set@@ne\undefined}{}}{}}
+ {}
+\providecommand\@expl at xcolor@set@@ne[2]{}
 \def\XC at colorlet[#1]#2{\@testopt{\XC at col@rlet[#1]{#2}}{}}
 \def\XC at col@rlet[#1]#2[#3]#4%
  {\@expl at xcolor@set@@ne{#2}{#4}%