[PATCH xserver] xkb: fix check for appending '|' character when applying rules

Ran Benita ran234 at gmail.com
Wed Aug 29 02:33:34 PDT 2012


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 at gmail.com>
---
 xkb/maprules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkb/maprules.c b/xkb/maprules.c
index c6900ec..131853e 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -573,7 +573,7 @@ static void
 Apply(char *src, char **dst)
 {
     if (src) {
-        if (*src == '+' || *src == '!') {
+        if (*src == '+' || *src == '|') {
             *dst = _Concat(*dst, src);
         }
         else {
-- 
1.7.12



More information about the xorg-devel mailing list