aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-07 07:23:20 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-07 07:23:20 +0100
commit5487d52fe1c37244c649c3aefb78600f08ffb91b (patch)
tree2d30b58a9044c67c5f844fa9bc424ef7faa4052a /nx-X11/programs/Xserver/xkb
parentc571aa9eda7d69b3de1647a208c685a971c9ad38 (diff)
parentaac4c5f590de3a6dacb01579848b25f6bdd3cc56 (diff)
downloadnx-libs-5487d52fe1c37244c649c3aefb78600f08ffb91b.tar.gz
nx-libs-5487d52fe1c37244c649c3aefb78600f08ffb91b.tar.bz2
nx-libs-5487d52fe1c37244c649c3aefb78600f08ffb91b.zip
Merge branch 'uli42-pr/various_backports' into 3.6.x
Attributes GH PR #581: https://github.com/ArcticaProject/nx-libs/pull/581 Fixes: ArcticaProject/nx-libs#558 Fixes: ArcticaProject/nx-libs#541 Fixes: ArcticaProject/nx-libs#542
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
-rw-r--r--nx-X11/programs/Xserver/xkb/maprules.c7
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");