Attachment 69381 Details for Bug 25873 – signed off patch

[patch] signed off patch

0001-Apply-partial-matches-for-option-25873.patch (text/plain), 1.16 KB, created by Alexey Ten on 2012-11-01 07:14:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Ten

Created: 2012-11-01 07:14:45 UTC

Size: 1.16 KB

patch

obsolete

>From 3e219a046c803d2a03e5a5b061ded8a2252b9101 Mon Sep 17 00:00:00 2001
>From: "Alexey Ten (Lynn)" <alexeyten@gmail.com>
>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 <http://bugs.freedesktop.org/show_bug.cgi?id=25873>
>
>Signed-off-by: Alexey Ten (Lynn) <alexeyten@gmail.com>
>---
> 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
>

Actions: View | Splinter Review

Attachments on bug 25873: 32414 | 32415 | 68943 | 69381

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.