summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-11-05 17:16:07 -0800
committerKeith Packard <keithp@keithp.com>2012-11-05 17:16:07 -0800
commit011f8458805e443ac9130865d2840a929a00cabf (patch)
tree62c823cef49bce284f75ab60d2f439acad62b4dc /xkb
parent54ba26cb1f9c59559cc3c449abeb31b2ce23bdba (diff)
parentb4e44b285ed0eee1d06514215a4b01d54f40094b (diff)
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'xkb')
-rw-r--r--xkb/maprules.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xkb/maprules.c b/xkb/maprules.c
index c6900eccb..5462763d1 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -864,6 +864,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);