merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE

34 files changed, 38 insertions, 34 deletions

diff --git a/README.config b/README.config
index 9a94577..229049d 100644
--- a/README.config
+++ b/README.config
@@ -195,4 +195,4 @@ compatibility reasons. Avoid using it if it is possible.
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $
 
 
-$XFree86: xc/programs/xkbcomp/README.config,v 1.6 2003/09/21 01:55:04 dawes Exp $
+$XFree86: $
diff --git a/README.enhancing b/README.enhancing
index 695cc5d..db78026 100644
--- a/README.enhancing
+++ b/README.enhancing
@@ -508,4 +508,4 @@ And that should be it. Enjoy creating your own xkb mapping.
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.2 dawes Exp $
 
 
-$XFree86: xc/programs/xkbcomp/README.enhancing,v 1.5 2003/10/19 19:57:44 dawes Exp $
+$XFree86: $
diff --git a/action.c b/action.c
index af0648e..023d1eb 100644
--- a/action.c
+++ b/action.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/action.c,v 3.11 2002/11/22 22:56:04 tsi Exp $ */
+/* $XFree86: xc/programs/xkbcomp/action.c,v 3.10tsi Exp $ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
diff --git a/action.h b/action.h
index c442a41..4a11664 100644
--- a/action.h
+++ b/action.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/action.h,v 3.3 2002/07/01 02:26:00 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef ACTION_H
 #define ACTION_H 1
diff --git a/alias.c b/alias.c
index 3447341..f228b0d 100644
--- a/alias.c
+++ b/alias.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.5 2002/07/01 02:26:00 tsi Exp $ */
+/* $XFree86$ */
 
 #include "xkbcomp.h"
 #include "misc.h"
diff --git a/alias.h b/alias.h
index b1a1905..fd03388 100644
--- a/alias.h
+++ b/alias.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/alias.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef ALIAS_H
 #define ALIAS_H 1
diff --git a/compat.c b/compat.c
index 5e28590..6a7cfb1 100644
--- a/compat.c
+++ b/compat.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/compat.c,v 3.4 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/compat.c,v 3.3 2001/01/17 23:45:43 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include "xkbcomp.h"
diff --git a/compat.h b/compat.h
index 0d47b69..4edf788 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xkbcomp/compat.h,v 1.1 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef COMPAT_H
 #define COMPAT_H 1
diff --git a/expr.c b/expr.c
index f48bcb9..ba91187 100644
--- a/expr.c
+++ b/expr.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/xkbcomp/expr.c,v 1.1.4.3.4.1 2004/03/04 17:49:08 eich Exp $ */
 /* $Xorg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */
 /************************************************************
  Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -245,6 +246,7 @@ static LookupEntry modIndexNames[] = {
 	{	"mod3",		Mod3MapIndex	},
 	{	"mod4",		Mod4MapIndex	},
 	{	"mod5",		Mod5MapIndex	},
+	{	"none",		XkbNoModifier	},
 	{	NULL,		0		}
 };
 
diff --git a/expr.h b/expr.h
index 4e33dac..3946cf0 100644
--- a/expr.h
+++ b/expr.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/expr.h,v 3.3 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef EXPR_H
 #define EXPR_H 1
diff --git a/geometry.c b/geometry.c
index 6a249de..b6463cc 100644
--- a/geometry.c
+++ b/geometry.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.5 2003/08/06 14:04:05 eich Exp $ */
+/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.5tsi Exp $ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
@@ -438,8 +438,10 @@ DoodadInfo *	dflt;
     di->section= si;
     if (si!=NULL) {
 	di->priority= si->nextDoodadPriority++;
+#if XkbGeomMaxPriority < 255
 	if (si->nextDoodadPriority>XkbGeomMaxPriority)
 	    si->nextDoodadPriority= XkbGeomMaxPriority;
+#endif
     }
     else {
 	di->priority= info->nextPriority++;
diff --git a/indicators.c b/indicators.c
index 9ff2ffa..3061f3e 100644
--- a/indicators.c
+++ b/indicators.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/indicators.c,v 1.5 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/indicators.c,v 1.4 2001/01/17 23:45:43 dawes Exp $ */
 
 #include "xkbcomp.h"
 #include "misc.h"
diff --git a/indicators.h b/indicators.h
index c1d5ea9..041cacc 100644
--- a/indicators.h
+++ b/indicators.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/indicators.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef INDICATORS_H
 #define INDICATORS_H 1
diff --git a/keycodes.c b/keycodes.c
index 47b6624..6b2fdd8 100644
--- a/keycodes.c
+++ b/keycodes.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/keycodes.c,v 3.5 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
diff --git a/keycodes.h b/keycodes.h
index 3558073..9333718 100644
--- a/keycodes.h
+++ b/keycodes.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/keycodes.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef KEYCODES_H
 #define KEYCODES_H 1
diff --git a/keymap.c b/keymap.c
index a654abd..86e9c9e 100644
--- a/keymap.c
+++ b/keymap.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/keymap.c,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
diff --git a/keytypes.c b/keytypes.c
index 3e829e8..e436136 100644
--- a/keytypes.c
+++ b/keytypes.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/keytypes.c,v 1.5 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/keytypes.c,v 1.4 2001/01/17 23:45:44 dawes Exp $ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
diff --git a/listing.c b/listing.c
index ac4ee61..d3a359c 100644
--- a/listing.c
+++ b/listing.c
@@ -70,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.10 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.9 2001/12/14 20:01:57 dawes Exp $ */
 
 
 #include <stdio.h>
diff --git a/misc.c b/misc.c
index 1cdbf1f..1d6f7b4 100644
--- a/misc.c
+++ b/misc.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/misc.c,v 3.6 2002/12/20 20:18:33 paulo Exp $ */
+/* $XFree86: xc/programs/xkbcomp/misc.c,v 3.4 2001/01/17 23:45:44 dawes Exp $ */
 
 #include "xkbcomp.h"
 #include "xkbpath.h"
diff --git a/misc.h b/misc.h
index 6789330..5546169 100644
--- a/misc.h
+++ b/misc.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/misc.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef MISC_H
 #define MISC_H 1
diff --git a/parseutils.c b/parseutils.c
index 88a2b20..bae18f9 100644
--- a/parseutils.c
+++ b/parseutils.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/parseutils.c,v 1.5 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #define DEBUG_VAR_NOT_LOCAL
 #define	DEBUG_VAR parseDebug
diff --git a/parseutils.h b/parseutils.h
index 7be50d1..2f29e9e 100644
--- a/parseutils.h
+++ b/parseutils.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/parseutils.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef XKBPARSE_H
 #define	XKBPARSE_H 1
diff --git a/symbols.c b/symbols.c
index 83c1527..75c2aaa 100644
--- a/symbols.c
+++ b/symbols.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/symbols.c,v 3.16 2003/10/31 14:32:04 pascal Exp $ */
+/* $XFree86: xc/programs/xkbcomp/symbols.c,v 3.15 2003/04/19 12:25:31 pascal Exp $ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
diff --git a/utils.c b/utils.c
index db4bee2..93850d4 100644
--- a/utils.c
+++ b/utils.c
@@ -25,7 +25,7 @@
    * used in advertising or publicity pertaining to distribution of the 
    * software without specific, written prior permission.
   \*/
-/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.7 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.6 2001/07/25 15:05:24 dawes Exp $ */
 
 #include 	"utils.h"
 #include	<ctype.h>
diff --git a/utils.h b/utils.h
index d150642..d57e6da 100644
--- a/utils.h
+++ b/utils.h
@@ -27,7 +27,7 @@
    * used in advertising or publicity pertaining to distribution of the 
    * software without specific, written prior permission.
   \*/
-/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.6 2002/12/24 17:43:00 tsi Exp $ */
+/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.5 2002/06/05 00:00:37 dawes Exp $ */
 
 /***====================================================================***/
 
diff --git a/vmod.c b/vmod.c
index 326fc21..6d9628c 100644
--- a/vmod.c
+++ b/vmod.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/vmod.c,v 3.4 2002/06/05 00:00:37 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/vmod.c,v 3.3 2001/01/17 23:45:45 dawes Exp $ */
 
 #define	DEBUG_VAR_NOT_LOCAL
 #define	DEBUG_VAR debugFlags
diff --git a/vmod.h b/vmod.h
index b98183b..231d2c8 100644
--- a/vmod.h
+++ b/vmod.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/vmod.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef VMOD_H
 #define VMOD_H 1
diff --git a/xkbcomp.c b/xkbcomp.c
index bf8a723..962fa61 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbcomp.c,v 3.21 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbcomp.c,v 3.20 2003/09/24 02:43:38 dawes Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xkbcomp.h b/xkbcomp.h
index 0584846..b9b9cae 100644
--- a/xkbcomp.h
+++ b/xkbcomp.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.9 2002/06/05 00:00:38 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.8 2001/12/19 21:30:30 dawes Exp $ */
 
 #ifndef XKBCOMP_H
 #define	XKBCOMP_H 1
diff --git a/xkbcomp.man b/xkbcomp.man
index 29c19c1..aa18d3e 100644
--- a/xkbcomp.man
+++ b/xkbcomp.man
@@ -26,8 +26,8 @@ used to verify that the files which typically make up an XKB keymap
 are merged correctly or to create a single file which contains a complete
 description of the keymap.
 .PP
-The \fIsource\fP may specify an X display, or an \fI.xkb\fP or
-\fI.xkm\fP file;  unless explicitly specified, the format of \fIdestination\fP
+The \fIsource\fP may specify an X display, or an \fI.xkb\fP or \fI.xkm\fP
+file;  unless explicitly specified, the format of \fIdestination\fP
 depends on the format of the source.   Compiling a \fI.xkb\fP (keymap source) 
 file generates a \fI.xkm\fP (compiled keymap file) by default.   If the 
 source is a \fI.xkm\fP file or an X display, \fIxkbcomp\fP generates a 
diff --git a/xkbparse.y b/xkbparse.y
index c8036e4..b50b9e8 100644
--- a/xkbparse.y
+++ b/xkbparse.y
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.12 2002/10/16 21:33:04 tsi Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.11tsi Exp $ */
 
 %token
 	END_OF_FILE	0
diff --git a/xkbpath.c b/xkbpath.c
index 4bfd7f2..ffedd5a 100644
--- a/xkbpath.c
+++ b/xkbpath.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.8 2002/11/15 03:14:12 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.7 2002/06/05 00:00:38 dawes Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
diff --git a/xkbpath.h b/xkbpath.h
index 8b667ed..64f07c9 100644
--- a/xkbpath.h
+++ b/xkbpath.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.4 2002/11/15 03:14:12 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
 
 #ifndef _XKBPATH_H_
 #define _XKBPATH_H_ 1
diff --git a/xkbscan.c b/xkbscan.c
index 579583b..8d70220 100644
--- a/xkbscan.c
+++ b/xkbscan.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbscan.c,v 3.12 2003/08/06 14:04:05 eich Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbscan.c,v 3.10 2001/01/17 23:45:45 dawes Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>