From 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 8 Dec 2011 09:26:34 +0100 Subject: git update glproto libX11 libxcb mesa xserver 8 dec 2011 --- xkbcomp/compat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xkbcomp') diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c index 759535a38..2b0014244 100644 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -50,6 +50,7 @@ typedef struct _GroupCompatInfo { unsigned char fileID; unsigned char merge; + Bool defined; unsigned char real_mods; unsigned short vmods; } GroupCompatInfo; @@ -280,8 +281,8 @@ AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC) ACTION1("Using %s definition\n", (merge == MergeAugment ? "old" : "new")); } - if (merge != MergeAugment) - *gc = *newGC; + if(newGC->defined && (merge != MergeAugment || !gc->defined)) + *gc = *newGC; return True; } @@ -715,6 +716,7 @@ HandleGroupCompatDef(GroupCompatDef * def, } tmp.real_mods = val.uval & 0xff; tmp.vmods = (val.uval >> 8) & 0xffff; + tmp.defined = True; return AddGroupCompat(info, def->group - 1, &tmp); } -- cgit v1.2.3