From e05b90814984e65bac2dc602bc368b2046a7b92e Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 5 Dec 2017 22:22:55 +0100
Subject: 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>
---
 nx-X11/programs/Xserver/xkb/maprules.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'nx-X11/programs')

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");
-- 
cgit v1.2.3