diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-22 14:37:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-22 14:37:00 +0200 |
| commit | 94ff13d0213bde2ff6c643c73bf9f9339fca026e (patch) | |
| tree | 073c4e0cd26a7c1611e2201a384e78eca000dda8 /xkbcomp/compat.c | |
| parent | e980a639952c7b2732b53c63e64335f14c319381 (diff) | |
| parent | 1b072e6a8a80ac63d1b3469d76d4854d5c7835c1 (diff) | |
| download | vcxsrv-94ff13d0213bde2ff6c643c73bf9f9339fca026e.tar.gz vcxsrv-94ff13d0213bde2ff6c643c73bf9f9339fca026e.tar.bz2 vcxsrv-94ff13d0213bde2ff6c643c73bf9f9339fca026e.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xkbcomp/xkbcomp.c
xkbcomp/xkbcomp.h
xkbcomp/xkbparse.y
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; |