Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

32 files changed, 42 insertions, 32 deletions

diff --git a/actions.h b/actions.h
index 9694489..3318927 100644
--- a/actions.h
+++ b/actions.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
  *
  */
-/* $XFree86: xc/programs/xmh/actions.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #define XMH_ACTION_ARGS Widget, XEvent *, String *, Cardinal *
 
diff --git a/bbox.c b/bbox.c
index 2295eaf..5d717f3 100644
--- a/bbox.c
+++ b/bbox.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/bbox.c,v 1.3 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/bbox.c,v 1.2 2001/10/28 03:34:38 tsi Exp $ */
 
 /* bbox.c -- management of buttons and buttonboxes. 
  *
diff --git a/bbox.h b/bbox.h
index 4aaa7fa..3886329 100644
--- a/bbox.h
+++ b/bbox.h
@@ -23,7 +23,7 @@
  * advertising or publicity pertaining to distribution of the software without
  * specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/bbox.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _bbox_h
 #define _bbox_h
diff --git a/command.c b/command.c
index b6e8468..a4328d8 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /* $XConsortium: command.c,v 2.49 95/04/05 19:59:06 kaleb Exp $ */
-/* $XFree86: xc/programs/xmh/command.c,v 3.9 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/command.c,v 3.8 2001/12/09 15:48:36 herrb Exp $ */
 
 /*
  *			  COPYRIGHT 1987, 1989
diff --git a/compfuncs.c b/compfuncs.c
index 957249e..12b2ef4 100644
--- a/compfuncs.c
+++ b/compfuncs.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/compfuncs.c,v 1.3 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/compfuncs.c,v 1.2 2001/08/01 00:45:06 tsi Exp $ */
 
 /* comp.c -- action procedures to handle composition buttons. */
 
diff --git a/externs.h b/externs.h
index 668ffaa..7770cff 100644
--- a/externs.h
+++ b/externs.h
@@ -25,7 +25,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/externs.h,v 1.5 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/externs.h,v 1.4 2001/10/28 03:34:38 tsi Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <errno.h>
diff --git a/folder.c b/folder.c
index 91502d9..485122e 100644
--- a/folder.c
+++ b/folder.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/folder.c,v 1.4 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/folder.c,v 1.3 2001/10/28 03:34:38 tsi Exp $ */
 
 /* folder.c -- implement buttons relating to folders and other globals. */
 
diff --git a/globals.h b/globals.h
index 286aca5..fe920c0 100644
--- a/globals.h
+++ b/globals.h
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/globals.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifdef MAIN
 #define ext
diff --git a/init.c b/init.c
index b8c98b0..8470c63 100644
--- a/init.c
+++ b/init.c
@@ -25,7 +25,7 @@
  * without specific, written prior permission.
  *
  */
-/* $XFree86: xc/programs/xmh/init.c,v 1.6 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/init.c,v 1.5 2002/01/07 20:20:12 dawes Exp $ */
 
 /* Init.c - Handle start-up initialization. */
 
diff --git a/main.c b/main.c
index a67b82a..7034ea8 100644
--- a/main.c
+++ b/main.c
@@ -23,7 +23,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/main.c,v 1.3 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/main.c,v 1.2 2001/08/01 00:45:06 tsi Exp $ */
 
 #define MAIN 1			/* Makes global.h actually declare vars */
 #include "xmh.h"
diff --git a/menu.c b/menu.c
index 6372094..96d1b1f 100644
--- a/menu.c
+++ b/menu.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
  *
  */
-/* $XFree86: xc/programs/xmh/menu.c,v 1.3 2001/10/28 03:34:38 tsi Exp $ */
+/* $XFree86: xc/programs/xmh/menu.c,v 1.2 2001/08/01 00:45:06 tsi Exp $ */
 
 #include "xmh.h"
 #include "bboxint.h"
diff --git a/miscfuncs.c b/miscfuncs.c
index fef77dd..1f2cf34 100644
--- a/miscfuncs.c
+++ b/miscfuncs.c
@@ -1,5 +1,5 @@
 /* $XConsortium: miscfuncs.c,v 1.7 94/12/01 17:15:05 kaleb Exp $ */
-/* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.7 2002/04/05 21:06:28 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.6 2001/10/28 03:34:39 tsi Exp $ */
 
 #include "xmh.h"
 
diff --git a/mlist.c b/mlist.c
index 66ef29a..71e9b61 100644
--- a/mlist.c
+++ b/mlist.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/mlist.c,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 /* mlist.c -- functions to deal with message lists. */
 
diff --git a/mlist.h b/mlist.h
index 085dd4d..ab8f54d 100644
--- a/mlist.h
+++ b/mlist.h
@@ -23,7 +23,7 @@
  * or publicity pertaining to distribution of the software without specific,
  * written prior permission.
  */
-/* $XFree86: xc/programs/xmh/mlist.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _mlist_h
 #define _mlist_h
diff --git a/msg.c b/msg.c
index 9910163..8aaa5d7 100644
--- a/msg.c
+++ b/msg.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/msg.c,v 1.5 2003/05/28 14:14:40 tsi Exp $ */
+/* $XFree86: xc/programs/xmh/msg.c,v 1.4 2002/04/05 21:06:28 dickey Exp $ */
 
 /* msgs.c -- handle operations on messages. */
 
diff --git a/msg.h b/msg.h
index ba14fc0..c0de73f 100644
--- a/msg.h
+++ b/msg.h
@@ -23,7 +23,7 @@
  * or publicity pertaining to distribution of the software without specific,
  * written prior permission.
  */
-/* $XFree86: xc/programs/xmh/msg.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _msg_h
 #define _msg_h
diff --git a/pick.c b/pick.c
index ef20911..6977b93 100644
--- a/pick.c
+++ b/pick.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/pick.c,v 1.3 2002/04/05 21:06:29 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/pick.c,v 1.2 2001/08/01 00:45:06 tsi Exp $ */
 
 /* pick.c -- handle a pick subwidget. */
 
diff --git a/popup.c b/popup.c
index 72cc6ab..59eb3d1 100644
--- a/popup.c
+++ b/popup.c
@@ -23,7 +23,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/popup.c,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 /* popup.c -- Handle pop-up widgets. */
 
diff --git a/screen.c b/screen.c
index 50b8221..320e50e 100644
--- a/screen.c
+++ b/screen.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/screen.c,v 1.3 2002/04/05 21:06:29 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/screen.c,v 1.2 2001/10/28 03:34:39 tsi Exp $ */
 
 /* scrn.c -- management of scrns. */
 
diff --git a/toc.c b/toc.c
index c3bcd49..6340e33 100644
--- a/toc.c
+++ b/toc.c
@@ -1,5 +1,5 @@
 /* $XConsortium: toc.c,v 2.59 95/01/09 16:52:53 swick Exp $
- * $XFree86: xc/programs/xmh/toc.c,v 3.5 2002/04/05 21:06:29 dickey Exp $
+ * $XFree86: xc/programs/xmh/toc.c,v 3.4 2001/10/28 03:34:39 tsi Exp $
  *
  *
  *			  COPYRIGHT 1987
diff --git a/toc.h b/toc.h
index f070851..336bb00 100644
--- a/toc.h
+++ b/toc.h
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/toc.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _toc_h
 #define _toc_h
diff --git a/tocfuncs.c b/tocfuncs.c
index b60f413..d323ee0 100644
--- a/tocfuncs.c
+++ b/tocfuncs.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/tocfuncs.c,v 1.4 2002/04/05 21:06:29 dickey Exp $ */
+/* $XFree86: xc/programs/xmh/tocfuncs.c,v 1.3 2001/10/28 03:34:39 tsi Exp $ */
 
 /* tocfuncs.c -- action procedures concerning things in the toc widget. */
 
diff --git a/tocintrnl.h b/tocintrnl.h
index 525e2e3..7d58f56 100644
--- a/tocintrnl.h
+++ b/tocintrnl.h
@@ -1,4 +1,5 @@
 /* $XConsortium: tocintrnl.h,v 2.18 91/07/14 18:53:37 converse Exp $ */
+/* $XdotOrg$ */
 /*
  *			  COPYRIGHT 1987
  *		   DIGITAL EQUIPMENT CORPORATION
@@ -24,7 +25,7 @@
  * without specific, written prior permission.
  */
 
-/* $XFree86: xc/programs/xmh/tocintrnl.h,v 1.2 2003/05/27 22:27:08 tsi Exp $ */
+/* $XFree86$ */
 
 /* Includes for modules implementing toc stuff. */
 
@@ -39,6 +40,11 @@ typedef enum {
     unknown, valid, invalid
 } ValidType;
 
+/* silly IBM compiler, but it's probably just as silly to use bitfields. */
+#ifdef AIXV5 /* probably want !gcc too */
+#define FateType int
+#endif
+
 typedef struct _MsgRec {
     Toc		toc;		/* Which toc this message is in. */
     Toc		desttoc;	/* Folder to copy or move to (NULL if none) */
@@ -60,6 +66,10 @@ typedef struct _MsgRec {
     unsigned	unused:2;
 } MsgRec;
 
+#ifdef AIXV5 /* probably want !gcc too */
+#undef FateType
+#endif
+
 typedef struct _TocRec {
    Scrn		*scrn;		/* Scrns containing this table of contents. */
    Cardinal	num_scrns;	/* How many scrns are currently showing toc. */
diff --git a/tocutil.c b/tocutil.c
index 72be172..f4c7b52 100644
--- a/tocutil.c
+++ b/tocutil.c
@@ -1,6 +1,6 @@
 /*
  * $XConsortium: tocutil.c,v 2.60 95/01/09 16:52:53 swick Exp $
- * $XFree86: xc/programs/xmh/tocutil.c,v 3.4 2002/04/05 21:06:29 dickey Exp $
+ * $XFree86: xc/programs/xmh/tocutil.c,v 3.3 2001/10/28 03:34:40 tsi Exp $
  *
  *
  *			COPYRIGHT 1987, 1989
diff --git a/tocutil.h b/tocutil.h
index 5b0c593..892b93b 100644
--- a/tocutil.h
+++ b/tocutil.h
@@ -23,7 +23,7 @@
  * advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/tocutil.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _tocutil_h
 #define _tocutil_h
diff --git a/tsource.c b/tsource.c
index b9dec38..c65bc88 100644
--- a/tsource.c
+++ b/tsource.c
@@ -24,7 +24,7 @@
  * or publicity pertaining to distribution of the software without specific,
  * written prior permission.
  */
-/* $XFree86: xc/programs/xmh/tsource.c,v 1.4 2002/04/07 03:57:46 tsi Exp $ */
+/* $XFree86: xc/programs/xmh/tsource.c,v 1.3 2002/04/05 21:06:29 dickey Exp $ */
 
 /* File: tsource.c -- the code for a toc source */
 
diff --git a/tsource.h b/tsource.h
index 66eaf99..7dfd9ff 100644
--- a/tsource.h
+++ b/tsource.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xmh/tsource.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _tsource_h
 #define _tsource_h
diff --git a/util.c b/util.c
index 94a0719..0bd2949 100644
--- a/util.c
+++ b/util.c
@@ -1,6 +1,6 @@
 /*
  * $XConsortium: util.c /main/42 1996/01/14 16:51:55 kaleb $
- * $XFree86: xc/programs/xmh/util.c,v 3.7 2002/04/05 21:06:29 dickey Exp $
+ * $XFree86: xc/programs/xmh/util.c,v 3.6 2001/10/31 22:50:31 tsi Exp $
  *
  *
  *			  COPYRIGHT 1987
diff --git a/version.h b/version.h
index d87d9c4..ebf9d1d 100644
--- a/version.h
+++ b/version.h
@@ -29,4 +29,4 @@ from the X Consortium.
 
 */
 
-#define XMH_VERSION "xmh    X Consortium    R6.3"
+#define XMH_VERSION "xmh    "XVENDORNAME", "XORG_RELEASE
diff --git a/viewfuncs.c b/viewfuncs.c
index 18bbb41..234cc7b 100644
--- a/viewfuncs.c
+++ b/viewfuncs.c
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/viewfuncs.c,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 /* view.c -- action procedures to handle viewing of a message */
 
diff --git a/xmh.h b/xmh.h
index 61ba22e..5c5d67d 100644
--- a/xmh.h
+++ b/xmh.h
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/xmh.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _xmh_h
 #define _xmh_h
diff --git a/xmh.man b/xmh.man
index 6e80592..562a1ee 100644
--- a/xmh.man
+++ b/xmh.man
@@ -26,7 +26,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/xmh/xmh.man,v 1.4 2003/05/29 21:48:12 herrb Exp $
+.\" $XFree86: xc/programs/xmh/xmh.man,v 1.3 2001/01/27 18:21:19 dawes Exp $
 .\"
 .TH XMH 1 __xorgversion__
 .SH NAME