[Xorg-commit] xc/programs/xkbcomp geometry.c,1.1.4.2,1.1.4.3 xkbcomp.man,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xkbcomp
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xkbcomp

Modified Files:
      Tag: XORG-CURRENT
	geometry.c xkbcomp.man 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: geometry.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/geometry.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/geometry.c	26 Nov 2003 22:49:11 -0000	1.1.4.2
+++ b/geometry.c	23 Feb 2004 21:37:56 -0000	1.1.4.3
@@ -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.6 2003/12/22 17:48:13 tsi Exp $ */
 
 #include "xkbcomp.h"
 #include "tokens.h"
@@ -438,8 +438,10 @@
     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++;

Index: xkbcomp.man
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/xkbcomp.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xkbcomp.man	26 Nov 2003 22:49:11 -0000	1.1.4.2
+++ b/xkbcomp.man	23 Feb 2004 21:37:57 -0000	1.1.4.3
@@ -3,7 +3,7 @@
 .\"
 .\"
 .\"
-.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.11 2003/07/28 21:57:02 herrb Exp $
+.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.12 2004/01/12 21:43:20 herrb Exp $
 .\"
 .TH XKBCOMP 1 __xorgversion__
 .SH NAME
@@ -26,8 +26,8 @@
 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