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>

Allow options to appear with other components.
e05b9081 · Daniel Stone · Mihai Moldovan · e073093c · e05b9081
Commit e05b9081 authored Dec 05, 2017 by Daniel Stone Committed by Mihai Moldovan Dec 07, 2017
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

maprules.c nx-X11/programs/Xserver/xkb/maprules.c +0 -7

No files found.
--- 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");