rules: fix check for appending '|' character when applying
authorRan Benita <ran234@gmail.com>
Wed, 29 Aug 2012 09:10:28 +0000 (12:10 +0300)
committerRan Benita <ran234@gmail.com>
Mon, 3 Sep 2012 07:31:12 +0000 (10:31 +0300)
commit7f04ffc4d331868c66bf8abee5fc27fe61bad079
treeb25fda66f809fb002bf7e063eca081cc51bb44d3
parent41472822b68bd71b2b1ac5c2cf57f28b727ef744
rules: fix check for appending '|' character when applying

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.
Since '|' is practically never used, this wasn't noticed.

In the modified test, the '|some_compat' previously was just ignored.

Signed-off-by: Ran Benita <ran234@gmail.com>
src/xkbcomp/rules.c
test/data/rules/simple
test/rules-file.c