xserver: Branch 'master'

[Peter Hutterer]

 xkb/maprules.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 527c6baa294d17c5eca1d87ac941844872e90dac
Author: Ran Benita <ran234 at gmail.com>
Date:   Wed Aug 29 12:33:34 2012 +0300

    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 at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xkb/maprules.c b/xkb/maprules.c
index 8e22779..a096f20 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 {