From 527c6baa294d17c5eca1d87ac941844872e90dac Mon Sep 17 00:00:00 2001
From: Ran Benita <ran234@gmail.com>
Date: Wed, 29 Aug 2012 12:33:34 +0300
Subject: [PATCH] xkb: 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>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xkb/maprules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkb/maprules.c b/xkb/maprules.c
index 8e2277969..a096f2087 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -578,7 +578,7 @@ static void
 Apply(const char *src, char **dst)
 {
     if (src) {
-        if (*src == '+' || *src == '!') {
+        if (*src == '+' || *src == '|') {
             *dst = _Concat(*dst, src);
         }
         else {