From 81c6f985a9d7eb9e12c0f963103b1cbde8761783 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 20 Sep 2013 23:25:06 +0200 Subject: [PATCH] When overriding a key, also reduce its number of levels if needed. This gets rid of the age-old warning of the right Alt key being ONE_LEVEL but having two symbols assigned. Reducing the number of levels to that of the later definition takes away the cause of the warning. Signed-off-by: Benno Schulenberg --- symbols.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/symbols.c b/symbols.c index 5547999..d6f27cf 100644 --- a/symbols.c +++ b/symbols.c @@ -339,7 +339,7 @@ MergeKeyGroups(SymbolsInfo * info, clobber = (from->defs.merge != MergeAugment); report = (warningLevel > 9) || ((into->defs.fileID == from->defs.fileID) && (warningLevel > 0)); - if (into->numLevels[group] >= from->numLevels[group]) + if ((into->numLevels[group] >= from->numLevels[group]) && (from->defs.merge != MergeOverride)) { resultSyms = into->syms[group]; resultActs = into->acts[group]; -- 1.7.0.4