summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Ten <alexeyten+github@gmail.com>2009-01-15 01:39:01 +0300
committerPeter Hutterer <peter.hutterer@who-t.net>2009-01-15 09:04:52 +1000
commite695be2ab7eb1361b204f98c3da872eff58ad6b5 (patch)
treedb2e24babef21b9b6bd02d423880cbcb3dac58c9
parent415a513387748e1763a477a486a9789f88784ec5 (diff)
Apply partial matches for option (#19563)
Rules which match star (*) and option, like one below, should be applied layout[2] option = symbols * misc:typo = +typo(base) X.Org bug 19563 <http://bugs.freedesktop.org/show_bug.cgi?id=19563> Signed-off-by: Sergey V. Udaltsov <svu@gnome.org>
-rw-r--r--src/maprules.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/maprules.c b/src/maprules.c
index ab164c6..6060a03 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -891,6 +891,7 @@ XkbRF_GetComponents( XkbRF_RulesPtr rules,
XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Append);
XkbRF_ApplyPartialMatches(rules, names);
XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Option);
+ XkbRF_ApplyPartialMatches(rules, names);
if (names->keycodes)
names->keycodes= XkbRF_SubstituteVars(names->keycodes, &mdefs);