diff options
| author | Ran Benita <ran234@gmail.com> | 2012-08-29 12:33:34 +0300 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-09-07 15:16:13 +1000 |
| commit | 527c6baa294d17c5eca1d87ac941844872e90dac (patch) | |
| tree | b9825909d7ecedfe8ef062d4852fbe84c1ae7f82 /xkb | |
| parent | 392da389d7b0e9dd970741dcd5321a4e0fd3aef5 (diff) | |
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>
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/maprules.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |