From 0a0fb653430c3789541359e6137b6e358d2534cf Mon Sep 17 00:00:00 2001 From: Alexey Ten Date: Thu, 15 Jan 2009 01:39:01 +0300 Subject: [PATCH] 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 --- src/maprules.c | 1 + 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); -- 1.5.6.3