From 04336c9260b2d130f57fcf3dedc3ba73bb45889d Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 29 Aug 2012 12:33:33 +0300 Subject: Fix check for appending '|' character when applying rules There are two ways to separate multiple files in XKB include statements: '+' will cause the later file to override the first in case of conflict, while '|' will cause it augment it (this is done by xkbcomp). '!' is unrelated here. Currently, if someone tries to use '|' in a rule instead of '+', it won't have any effect. Since '|' is practically never used, this wasn't noticed. Signed-off-by: Ran Benita --- src/maprules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/maprules.c b/src/maprules.c index d42b105..20470f9 100644 --- a/src/maprules.c +++ b/src/maprules.c @@ -625,7 +625,7 @@ static void Apply(char *src, char **dst) { if (src) { - if (*src == '+' || *src == '!') { + if (*src == '+' || *src == '|') { *dst = _Concat(*dst, src); } else { -- cgit v1.2.1