l3 (29sep19)

git-svn-id: svn://tug.org/texlive/trunk@52214 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 8 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
index f2ddc9f2c14..a7097c3d5b7 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2019-09-19}
+% \date{Released 2019-09-28}
 %
 % \maketitle
 %
@@ -1569,12 +1569,6 @@
 %   Setting the code for a key first logs if appropriate that we are
 %   defining a new key, then saves the code.
 %    \begin{macrocode}
-\__kernel_patch:nnNNpn
-  {
-    \cs_if_exist:cF { \c_@@_code_root_tl #1 }
-      { \__kernel_debug_log:x { Defining~key~#1~\msg_line_context: } }
-  }
-  { }
 \cs_new_protected:Npn \@@_cmd_set:nn #1#2
   { \cs_set_protected:cpn { \c_@@_code_root_tl #1 } ##1 {#2} }
 \cs_generate_variant:Nn \@@_cmd_set:nn { nx , Vn , Vo }
@@ -1642,7 +1636,13 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_initialise:n #1
   {
-    \cs_if_exist_use:cT { \c_@@_code_root_tl \l_keys_path_tl } { {#1} }
+    \cs_if_exist:cTF
+      { \c_@@_inherit_root_tl \@@_parent:o \l_keys_path_tl }
+      { \@@_execute_inherit: }
+      {
+        \tl_clear:N \l_@@_inherit_tl
+        \cs_if_exist_use:cT { \c_@@_code_root_tl \l_keys_path_tl } { {#1} }
+      }
   }
 %    \end{macrocode}
 % \end{macro}