[latex3-commits] [git/LaTeX3-latex3-latex3] master: Deal with inherited keys before unknown keys (fixes #548) (ededa4d)

[Joseph Wright]

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

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

commit ededa4db701537a2d478dd0f86beeb281c5b1871
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Mar 3 15:09:15 2019 +0000

    Deal with inherited keys before unknown keys (fixes #548)


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

ededa4db701537a2d478dd0f86beeb281c5b1871
 l3kernel/CHANGELOG.md |    4 ++++
 l3kernel/l3keys.dtx   |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 1cfe6c0..d031adc 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -27,6 +27,10 @@ this project uses date-based 'snapshot' version identifiers.
 - Made deprecation errors less intrusive by default
 - Stopped providing do-nothing \color macro when undefined
 
+### Fixed
+
+- Treatment of inherited keys when setting only known keys (see #548)
+
 ### Removed
 
 - Experimental `\tl_reverse_tokens:n`
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 10023cb..085aaaa 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -2478,12 +2478,12 @@
           \exp_after:wN { \l_keys_value_tl }
       }
       {
-        \bool_if:NTF \l_@@_only_known_bool
-          { \@@_store_unused: }
+        \cs_if_exist:cTF
+          { \c_@@_inherit_root_tl \@@_parent:o \l_keys_path_tl }
+          { \@@_execute_inherit: }
           {
-            \cs_if_exist:cTF
-              { \c_@@_inherit_root_tl \@@_parent:o \l_keys_path_tl }
-              { \@@_execute_inherit: }
+            \bool_if:NTF \l_@@_only_known_bool
+              { \@@_store_unused: }
               { \@@_execute_unknown: }
           }
       }