summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:37:57 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:37:57 +0000
commit5be0ac3f15b0de8981560ada5939e11a62a9d326 (patch)
tree7855ec988df805a874719cefe4bc5c23a490c4f0
parentc3753ba83fc9f3ae414a5a70819d6f30433d9308 (diff)
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
-rw-r--r--geometry.c4
-rw-r--r--xkbcomp.man6
2 files changed, 6 insertions, 4 deletions
diff --git a/geometry.c b/geometry.c
index 6a249de..9d73361 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.6 2003/12/22 17:48:13 tsi 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/xkbcomp.man b/xkbcomp.man
index 29c19c1..55beef7 100644
--- a/xkbcomp.man
+++ b/xkbcomp.man
@@ -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 @@ 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