summaryrefslogtreecommitdiff
path: root/test/data/rules
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-08-29 12:10:28 +0300
committerRan Benita <ran234@gmail.com>2012-09-03 10:31:12 +0300
commit7f04ffc4d331868c66bf8abee5fc27fe61bad079 (patch)
treeb25fda66f809fb002bf7e063eca081cc51bb44d3 /test/data/rules
parent41472822b68bd71b2b1ac5c2cf57f28b727ef744 (diff)
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>
Diffstat (limited to 'test/data/rules')
-rw-r--r--test/data/rules/simple2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/data/rules/simple b/test/data/rules/simple
index 16fc495..446954e 100644
--- a/test/data/rules/simple
+++ b/test/data/rules/simple
@@ -18,4 +18,4 @@
* = default_compat
! option = compat
- my_option = +some:compat
+ my_option = |some:compat