Commit 164cec663600703987010a20cad895ad5b9efd09
2013-02-19T11:10:23
symbols: fix bad 'merge' assignment Bug introduced in 2a5b0c9dc1ad1488ecc6b139fd70e464eb687da6, was causing some keys to be merged incorrectly. Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 6f87a7b..3612632 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -520,7 +520,7 @@ MergeIncludedSymbols(SymbolsInfo *into, SymbolsInfo *from,
darray_append(into->group_names, *group_name);
darray_foreach(keyi, from->keys) {
- merge = (merge == MERGE_DEFAULT ? keyi->merge : merge);
+ keyi->merge = (merge == MERGE_DEFAULT ? keyi->merge : merge);
if (!AddKeySymbols(into, keyi))
into->errorCount++;
}