summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-08-29 12:33:33 +0300
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-08-20 15:48:34 -0700
commit04336c9260b2d130f57fcf3dedc3ba73bb45889d (patch)
tree4f5cbdc2e12f61050d92c20987751381952ba625 /src
parent6fa239504743475d566f53c278dae0f651ea199c (diff)
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 <ran234@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/maprules.c2
1 files changed, 1 insertions, 1 deletions
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 {