diff options
author | marha <marha@users.sourceforge.net> | 2011-06-22 14:05:58 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-06-22 14:05:58 +0200 |
commit | 1b072e6a8a80ac63d1b3469d76d4854d5c7835c1 (patch) | |
tree | e879cf96989e71bf19c625c0298ea74fd7ee6ca1 /xkbcomp/compat.c | |
parent | 8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (diff) | |
download | vcxsrv-1b072e6a8a80ac63d1b3469d76d4854d5c7835c1.tar.gz vcxsrv-1b072e6a8a80ac63d1b3469d76d4854d5c7835c1.tar.bz2 vcxsrv-1b072e6a8a80ac63d1b3469d76d4854d5c7835c1.zip |
mesa xkbcomp git update 22 June 2011
Diffstat (limited to 'xkbcomp/compat.c')
-rw-r--r-- | xkbcomp/compat.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c index 03c29efdc..759535a38 100644 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -656,8 +656,15 @@ HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge, { ERROR("Couldn't determine matching modifiers\n"); ACTION("Symbol interpretation ignored\n"); - return False; + return True; } + if (def->ignore) + { + ERROR("Couldn't lookup keysym\n"); + ACTION("Symbol interpretation ignored\n"); + return True; + } + if (def->merge != MergeDefault) merge = def->merge; |