diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2017-12-05 22:22:55 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-07 07:20:55 +0100 |
| commit | e05b90814984e65bac2dc602bc368b2046a7b92e (patch) | |
| tree | b0b013ab5b9b040bc427a33dfec418aab7c23d39 | |
| parent | e073093cc9ea46eb1740440d286c2874b98fd3ae (diff) | |
| download | nx-libs-e05b90814984e65bac2dc602bc368b2046a7b92e.tar.gz nx-libs-e05b90814984e65bac2dc602bc368b2046a7b92e.tar.bz2 nx-libs-e05b90814984e65bac2dc602bc368b2046a7b92e.zip | |
Allow options to appear with other components.
Backported from X.Org:
commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 28 16:55:26 2006 +0000
Bug # 5216: Allow options to appear with other components.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/maprules.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/xkb/maprules.c b/nx-X11/programs/Xserver/xkb/maprules.c index 337c8634b..de52aa4b5 100644 --- a/nx-X11/programs/Xserver/xkb/maprules.c +++ b/nx-X11/programs/Xserver/xkb/maprules.c @@ -358,13 +358,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"); |