diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | xkb/maprules.c | 7 |
2 files changed, 5 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2006-02-28 Daniel Stone <daniel@freedesktop.org> + + * xkb/maprules.c: + Bug #5216: Allow options to appear with other components. + 2006-02-28 Adam Jackson <ajax@freedesktop.org> * XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am: diff --git a/xkb/maprules.c b/xkb/maprules.c index 53decdcad..3c4905ad1 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -378,13 +378,6 @@ Bool found; remap->num_remap= 0; return; } - if (((present&PART_MASK)&(1<<OPTION))&& - ((present&PART_MASK)!=(1<<OPTION))) { - PR_DEBUG("Options cannot appear with other parts\n"); - PR_DEBUG("Illegal mapping ignored\n"); - remap->num_remap= 0; - return; - } if (((present&COMPONENT_MASK)&(1<<KEYMAP))&& ((present&COMPONENT_MASK)!=(1<<KEYMAP))) { PR_DEBUG("Keymap cannot appear with other components\n"); |