Commit 5be0ac3f authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214

parent c3753ba8
......@@ -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++;
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment