[latex3-commits] [git/LaTeX3-latex3-latex3] master: Set inheritance correctly with .initial:n property (fixes #631) (001b292d4)

[Joseph Wright]

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

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

commit 001b292d41f732941f82715fea3e104851981f4e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Sep 26 21:16:02 2019 +0100

    Set inheritance correctly with .initial:n property (fixes #631)


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

001b292d41f732941f82715fea3e104851981f4e
 l3kernel/CHANGELOG.md | 4 ++++
 l3kernel/l3keys.dtx   | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index e751f552f..a8d979bdc 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -35,6 +35,10 @@ this project uses date-based 'snapshot' version identifiers.
   - `\sys_rand_seed:`
   - Shell access functions
 
+### Fixed
+
+- Key `.initial:n` property when combined with inherited keys (see #631)
+
 ## [2019-09-19]
 
 ### Fixed
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 7476746c8..d90be4338 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1636,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}