diff options
| author | Ran Benita <ran234@gmail.com> | 2013-02-19 11:10:23 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2013-03-18 22:20:02 +0000 |
| commit | 164cec663600703987010a20cad895ad5b9efd09 (patch) | |
| tree | 81f875539f26c9777d47e9035519942b8b434cb8 /src | |
| parent | 8cee7490003381b7e1399e171a8c860edb3d634c (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/xkbcomp/symbols.c | 2 |
1 files changed, 1 insertions, 1 deletions
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++; } |