From 5b7384a3154a95a805b040e1910e276b52aada96 Mon Sep 17 00:00:00 2001
From: "Alexey Ten (Lynn)" <alexeyten@gmail.com>
Date: Tue, 23 Oct 2012 12:32:31 +0400
Subject: 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 <http://bugs.freedesktop.org/show_bug.cgi?id=25873>

Signed-off-by: Alexey Ten (Lynn) <alexeyten@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xkb/maprules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'xkb')

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);
-- 
cgit v1.2.3