vmod: Fix merge mode

xkbcommon · Jan 15, 2025 · 892a80a · 892a80a
1 parent ec9654b
commit 892a80a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
@@ -461,7 +461,7 @@ HandleIncludeCompatMap(CompatInfo *info, IncludeStmt *include)
         next_incl.default_interp = info->default_interp;
         next_incl.default_led = info->default_led;
 
-        HandleCompatMapFile(&next_incl, file, MERGE_OVERRIDE);
+        HandleCompatMapFile(&next_incl, file, stmt->merge);
 
         MergeIncludedCompatMaps(&included, &next_incl, stmt->merge);
 

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
@@ -744,7 +744,7 @@ HandleIncludeSymbols(SymbolsInfo *info, IncludeStmt *include)
             next_incl.explicit_group = info->explicit_group;
         }
 
-        HandleSymbolsFile(&next_incl, file, MERGE_OVERRIDE);
+        HandleSymbolsFile(&next_incl, file, stmt->merge);
 
         MergeIncludedSymbols(&included, &next_incl, stmt->merge);