From c3ac46d98ee4ebf45a7dc3cbf8a3f8d0c627fb4a Mon Sep 17 00:00:00 2001 From: "Alexey Ten (Lynn)" Date: Tue, 23 Oct 2012 12:32:31 +0400 Subject: [PATCH] Apply partial matches for option (#25873) Rules which match star (*) and option, like one below, should be applied layout[2] option = symbols * misc:typo = +typo(base) This is port of patch from #19563 (https://bugs.freedesktop.org/19563) because here we have own copy of maprules.c X.Org Bug 25873 --- xkb/maprules.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xkb/maprules.c b/xkb/maprules.c index c6900ec..5462763 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); -- 1.7.5.4