diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-02-28 16:55:26 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-02-28 16:55:26 +0000 |
| commit | 514262ec90db007dfce2c1523b2bc67988f395f1 (patch) | |
| tree | 0de83ba4f2f9a784de6025fc856e3adf954a0f48 | |
| parent | 46a7219986b402cb2ad4cfef2aa69d27f5508b6f (diff) | |
| download | xorg-lib-libxkbfile-514262ec90db007dfce2c1523b2bc67988f395f1.tar.gz | |
Bug #5216: Allow options to appear with other components.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/maprules.c | 7 |
2 files changed, 5 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2006-02-28 Daniel Stone <daniel@freedesktop.org> + + * src/maprules.c: + Bug #5216: Allow options to appear with other components. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/src/maprules.c b/src/maprules.c index 53decdc..3c4905a 100644 --- a/src/maprules.c +++ b/src/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"); |