Update to twm 1.0.5

31 files changed, 45 insertions, 115 deletions

diff --git a/app/twm/src/Makefile.am b/app/twm/src/Makefile.am
index dc0fe7208..cb6f615c9 100644
--- a/app/twm/src/Makefile.am
+++ b/app/twm/src/Makefile.am
@@ -71,14 +71,14 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 gram.h: gram.c
 
 deftwmrc.c:  system.twmrc
-	rm -f $@
-	echo '/* ' >>$@
-	echo ' * This file is generated automatically from the default' >>$@
-	echo ' * twm bindings file system.twmrc by the twm Imakefile.' >>$@
-	echo ' */' >>$@
-	echo '' >>$@
-	echo 'unsigned char *defTwmrc[] = {' >>$@
-	sed -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@
+	$(AM_V_GEN)rm -f $@ ; \
+	echo '/* ' >>$@ ; \
+	echo ' * This file is generated automatically from the default' >>$@ ; \
+	echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ ; \
+	echo ' */' >>$@ ; \
+	echo '' >>$@ ; \
+	echo 'unsigned char *defTwmrc[] = {' >>$@ ; \
+	sed -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@ ; \
 	echo '    (unsigned char *) 0 };' >>$@
 
-EXTRA_DIST = system.twmrc deftwmrc.sed siconify.bm
+EXTRA_DIST = deftwmrc.sed siconify.bm
diff --git a/app/twm/src/Makefile.in b/app/twm/src/Makefile.in
index fffdc2844..0e36a3d29 100644
--- a/app/twm/src/Makefile.in
+++ b/app/twm/src/Makefile.in
@@ -110,6 +110,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
@@ -119,7 +120,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -128,9 +132,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -148,6 +155,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 OBJEXT = @OBJEXT@
@@ -159,16 +167,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TWM_CFLAGS = @TWM_CFLAGS@
 TWM_LIBS = @TWM_LIBS@
 VERSION = @VERSION@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 YACC = @YACC@
+YACC_INST = @YACC_INST@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -183,23 +193,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -246,7 +263,7 @@ twm_SOURCES = \
 
 BUILT_SOURCES = gram.h gram.c lex.c deftwmrc.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = system.twmrc deftwmrc.sed siconify.bm
+EXTRA_DIST = deftwmrc.sed siconify.bm
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -261,9 +278,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -569,14 +586,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_rcDATA \
 gram.h: gram.c
 
 deftwmrc.c:  system.twmrc
-	rm -f $@
-	echo '/* ' >>$@
-	echo ' * This file is generated automatically from the default' >>$@
-	echo ' * twm bindings file system.twmrc by the twm Imakefile.' >>$@
-	echo ' */' >>$@
-	echo '' >>$@
-	echo 'unsigned char *defTwmrc[] = {' >>$@
-	sed -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@
+	$(AM_V_GEN)rm -f $@ ; \
+	echo '/* ' >>$@ ; \
+	echo ' * This file is generated automatically from the default' >>$@ ; \
+	echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ ; \
+	echo ' */' >>$@ ; \
+	echo '' >>$@ ; \
+	echo 'unsigned char *defTwmrc[] = {' >>$@ ; \
+	sed -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@ ; \
 	echo '    (unsigned char *) 0 };' >>$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/app/twm/src/add_window.c b/app/twm/src/add_window.c
index 47610a6b6..af7e38413 100644
--- a/app/twm/src/add_window.c
+++ b/app/twm/src/add_window.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/add_window.c,v 1.11 2002/04/04 14:05:58 eich Exp $ */
 /*****************************************************************************/
 /*
 
@@ -53,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /**********************************************************************
  *
- * $Xorg: add_window.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Add a new window, put the titlbar and other stuff around
  * the window
  *
diff --git a/app/twm/src/add_window.h b/app/twm/src/add_window.h
index 190c9ff49..9b883cb7a 100644
--- a/app/twm/src/add_window.h
+++ b/app/twm/src/add_window.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/add_window.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: add_window.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * AddWindow include file
  *
  * 31-Mar-88 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/cursor.c b/app/twm/src/cursor.c
index 3c15bd4f8..83c827e07 100644
--- a/app/twm/src/cursor.c
+++ b/app/twm/src/cursor.c
@@ -22,12 +22,9 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/cursor.c,v 1.4 2001/01/17 23:45:05 dawes Exp $ */
 
 /***********************************************************************
  *
- * $Xorg: cursor.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * cursor creation code
  *
  * 05-Apr-89 Thomas E. LaStrange	File created
diff --git a/app/twm/src/events.c b/app/twm/src/events.c
index 57399a104..7df232aec 100644
--- a/app/twm/src/events.c
+++ b/app/twm/src/events.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/events.c,v 1.12 2001/12/14 20:01:06 dawes Exp $ */
 /*****************************************************************************/
 /*
 
@@ -53,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: events.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * twm event handling
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/app/twm/src/events.h b/app/twm/src/events.h
index 6bc941e82..3ed340ba0 100644
--- a/app/twm/src/events.h
+++ b/app/twm/src/events.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/events.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: events.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * twm event handler include file
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/app/twm/src/gc.c b/app/twm/src/gc.c
index 65a94f514..a1cb61385 100644
--- a/app/twm/src/gc.c
+++ b/app/twm/src/gc.c
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /*    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    */
 /*    OR PERFORMANCE OF THIS SOFTWARE.                                     */
 /*********************************************************************(*****/
-/* $XFree86: xc/programs/twm/gc.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: gc.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Open the fonts and create the GCs
  *
  * 31-Mar-88 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/gc.h b/app/twm/src/gc.h
index c0b9566ac..2d7150959 100644
--- a/app/twm/src/gc.h
+++ b/app/twm/src/gc.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/gc.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: gc.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * GC related externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/iconmgr.c b/app/twm/src/iconmgr.c
index 9eebf9fd4..e0fea0ae9 100644
--- a/app/twm/src/iconmgr.c
+++ b/app/twm/src/iconmgr.c
@@ -22,18 +22,14 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 /***********************************************************************
  *
- * $Xorg: iconmgr.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon Manager routines
  *
  * 09-Mar-89 Tom LaStrange		File Created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 #include <stdio.h>
 #include "twm.h"
diff --git a/app/twm/src/iconmgr.h b/app/twm/src/iconmgr.h
index eba3dc5e0..8e8e5153e 100644
--- a/app/twm/src/iconmgr.h
+++ b/app/twm/src/iconmgr.h
@@ -22,12 +22,9 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/iconmgr.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 /***********************************************************************
  *
- * $Xorg: iconmgr.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon Manager includes
  *
  * 09-Mar-89 Tom LaStrange		File Created
diff --git a/app/twm/src/icons.c b/app/twm/src/icons.c
index be0410d03..d026f4aad 100644
--- a/app/twm/src/icons.c
+++ b/app/twm/src/icons.c
@@ -22,12 +22,9 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/icons.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */
 
 /**********************************************************************
  *
- * $Xorg: icons.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon releated routines
  *
  * 10-Apr-89 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/icons.h b/app/twm/src/icons.h
index a59e42c9b..c2fcfb3f0 100644
--- a/app/twm/src/icons.h
+++ b/app/twm/src/icons.h
@@ -22,12 +22,9 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/icons.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */
 
 /**********************************************************************
  *
- * $Xorg: icons.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * Icon releated definitions
  *
  * 10-Apr-89 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/list.c b/app/twm/src/list.c
index 9a5b4f59f..d2ba75a23 100644
--- a/app/twm/src/list.c
+++ b/app/twm/src/list.c
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/list.c,v 1.8 2002/09/24 21:00:27 tsi Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: list.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * TWM code to deal with the name lists for the NoTitle list and
  * the AutoRaise list
  *
diff --git a/app/twm/src/list.h b/app/twm/src/list.h
index 35488f57a..c67785daa 100644
--- a/app/twm/src/list.h
+++ b/app/twm/src/list.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/list.h,v 1.4 2001/01/17 23:45:07 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: list.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * TWM list handling external definitions
  *
  * 11-Apr-88 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/menus.c b/app/twm/src/menus.c
index eaf9cf9ee..4c10dedec 100644
--- a/app/twm/src/menus.c
+++ b/app/twm/src/menus.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/menus.c,v 1.18tsi Exp $ */
 /*****************************************************************************/
 /*
 
@@ -53,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: menus.c,v 1.6 2001/02/09 02:05:36 xorgcvs Exp $
- *
  * twm menu code
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/app/twm/src/menus.h b/app/twm/src/menus.h
index 6e8c31f59..0a75622aa 100644
--- a/app/twm/src/menus.h
+++ b/app/twm/src/menus.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/menus.h,v 1.5 2001/08/27 21:11:40 dawes Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: menus.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm menus include file
  *
  * 17-Nov-87 Thomas E. LaStrange		File created
diff --git a/app/twm/src/parse.c b/app/twm/src/parse.c
index c89da98e5..0734d9e84 100644
--- a/app/twm/src/parse.c
+++ b/app/twm/src/parse.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: $ */
-/* $XFree86: xc/programs/twm/parse.c,v 1.15 2002/09/24 21:00:28 tsi Exp $ */
 /*****************************************************************************/
 /*
 
@@ -54,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: parse.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * parse the .twmrc file
  *
  * 17-Nov-87 Thomas E. LaStrange       File created
diff --git a/app/twm/src/parse.h b/app/twm/src/parse.h
index 1768f1091..35ef93236 100644
--- a/app/twm/src/parse.h
+++ b/app/twm/src/parse.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: $ */
-/* $XFree86: xc/programs/twm/parse.h,v 1.10 2001/09/30 17:58:19 herrb Exp $ */
 /*****************************************************************************/
 /*
 
@@ -54,8 +52,6 @@ in this Software without prior written authorization from The Open Group.
 
 /**********************************************************************
  *
- * $Xorg: parse.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * .twmrc parsing externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/resize.c b/app/twm/src/resize.c
index a6950d7f7..cd7550f68 100644
--- a/app/twm/src/resize.c
+++ b/app/twm/src/resize.c
@@ -52,16 +52,12 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: resize.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * window resizing borrowed from the "wm" window manager
  *
  * 11-Dec-87 Thomas E. LaStrange                File created
  *
  ***********************************************************************/
 
-/* $XFree86: xc/programs/twm/resize.c,v 1.7 2001/01/17 23:45:07 dawes Exp $ */
-
 #include <stdio.h>
 #include "twm.h"
 #include "parse.h"
diff --git a/app/twm/src/resize.h b/app/twm/src/resize.h
index 4cee8f21b..0f4b675e6 100644
--- a/app/twm/src/resize.h
+++ b/app/twm/src/resize.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/resize.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */
 
 
 /**********************************************************************
  *
- * $Xorg: resize.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * resize function externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.
diff --git a/app/twm/src/screen.h b/app/twm/src/screen.h
index 2299262c8..db40be1bf 100644
--- a/app/twm/src/screen.h
+++ b/app/twm/src/screen.h
@@ -25,14 +25,11 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: screen.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm per-screen data include file
  *
  * 11-3-88 Dave Payne, Apple Computer			File created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/screen.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */
 
 #ifndef _SCREEN_
 #define _SCREEN_
diff --git a/app/twm/src/session.c b/app/twm/src/session.c
index 87af4e132..c878ea69e 100644
--- a/app/twm/src/session.c
+++ b/app/twm/src/session.c
@@ -1,5 +1,3 @@
-/* $Xorg: session.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ */
-/* $XdotOrg: app/twm/src/session.c,v 1.3 2005/07/16 22:07:13 alanc Exp $ */
 /******************************************************************************
 
 Copyright 1994, 1998  The Open Group
@@ -26,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/twm/session.c,v 3.8 2001/12/14 20:01:10 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -53,7 +50,7 @@ Author:  Ralph Mor, X Consortium
 #endif
 #endif
 #endif /* PATH_MAX */
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
 #include <unistd.h>
 #endif
 
@@ -74,7 +71,7 @@ Bool sent_save_done = 0;
 
 #define SAVEFILE_VERSION 2
 
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
 static char *unique_filename ( char *path, char *prefix );
 #else
 static char *unique_filename ( char *path, char *prefix, int *pFd );
@@ -720,7 +717,7 @@ Bool *height_ever_changed_by_user;
 
 
 
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
 static char *
 unique_filename (path, prefix)
 char *path;
@@ -734,7 +731,7 @@ int *pFd;
 #endif
 
 {
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
 #ifndef X_NOT_POSIX
     return ((char *) tempnam (path, prefix));
 #else
@@ -783,7 +780,7 @@ SmPointer clientData;
     char discardCommand[80];
     int numVals, i;
     static int first_time = 1;
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
     int fd;
 #endif
 
@@ -830,7 +827,7 @@ SmPointer clientData;
 	if (!path)
 	    path = ".";
     }
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
     if ((filename = unique_filename (path, ".twm")) == NULL)
 	goto bad;
 
diff --git a/app/twm/src/session.h b/app/twm/src/session.h
index cc59a7db0..21f951aeb 100644
--- a/app/twm/src/session.h
+++ b/app/twm/src/session.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/twm/session.h,v 1.1 1999/02/20 14:55:52 hohndel Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/app/twm/src/system.twmrc b/app/twm/src/system.twmrc
index 9b8457621..175c7aa2f 100644
--- a/app/twm/src/system.twmrc
+++ b/app/twm/src/system.twmrc
@@ -1,6 +1,4 @@
 #
-# $Xorg: system.twmrc,v 1.3 2000/08/17 19:54:08 cpqbld Exp $
-# 
 # Default twm configuration file; needs to be kept small to conserve string
 # space in systems whose compilers don't handle medium-sized strings.
 #
@@ -9,8 +7,6 @@
 # users were accustomed to uwm, the defaults could be set up not to decorate
 # any windows and to use meta-keys.
 #
-# $XFree86: xc/programs/twm/system.twmrc,v 1.4 2001/01/17 23:45:08 dawes Exp $
-#
 
 NoGrabServer
 RestartPreviousState
diff --git a/app/twm/src/twm.c b/app/twm/src/twm.c
index f0f645ef8..adbd071f4 100644
--- a/app/twm/src/twm.c
+++ b/app/twm/src/twm.c
@@ -53,15 +53,12 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: twm.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm - "Tom's Window Manager"
  *
  * 27-Oct-1987 Thomas E. LaStrange    File created
  * 10-Oct-1990 David M. Sternlicht    Storing saved colors on root
  * 19-Feb-2005 Julien Lafon           Handle print screens for unified Xserver
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/twm.c,v 3.13 2003/04/21 08:15:10 herrb Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/app/twm/src/twm.h b/app/twm/src/twm.h
index 1998af11b..420d6c8f5 100644
--- a/app/twm/src/twm.h
+++ b/app/twm/src/twm.h
@@ -53,14 +53,11 @@ from The Open Group.
 
 /***********************************************************************
  *
- * $Xorg: twm.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * twm include file
  *
  * 28-Oct-87 Thomas E. LaStrange	File created
  * 10-Oct-90 David M. Sternlicht        Storeing saved colors on root
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/twm.h,v 3.12 2001/12/14 20:01:10 dawes Exp $ */
 
 #ifndef _TWM_
 #define _TWM_
diff --git a/app/twm/src/util.c b/app/twm/src/util.c
index 50675fd2f..ee30d0602 100644
--- a/app/twm/src/util.c
+++ b/app/twm/src/util.c
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/util.c,v 1.12 2002/09/19 13:22:05 tsi Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: util.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * utility routines for twm
  *
  * 28-Oct-87 Thomas E. LaStrange	File created
diff --git a/app/twm/src/util.h b/app/twm/src/util.h
index 4cbd0915f..216e9d988 100644
--- a/app/twm/src/util.h
+++ b/app/twm/src/util.h
@@ -48,13 +48,10 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/util.h,v 1.6 2001/01/17 23:45:08 dawes Exp $ */
 
 
 /***********************************************************************
  *
- * $Xorg: util.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * utility routines header file
  *
  * 28-Oct-87 Thomas E. LaStrange		File created
diff --git a/app/twm/src/version.c b/app/twm/src/version.c
index ecd0d71d3..b50a12916 100644
--- a/app/twm/src/version.c
+++ b/app/twm/src/version.c
@@ -49,6 +49,5 @@ in this Software without prior written authorization from The Open Group.
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
 
-/* $Xorg: version.c,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ */
 char *Version = XVENDORNAME", "XORG_RELEASE;
 
diff --git a/app/twm/src/version.h b/app/twm/src/version.h
index d23219067..0239c2bcf 100644
--- a/app/twm/src/version.h
+++ b/app/twm/src/version.h
@@ -51,8 +51,6 @@ in this Software without prior written authorization from The Open Group.
 
 /**********************************************************************
  *
- * $Xorg: version.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $
- *
  * TWM version externs
  *
  *  8-Apr-88 Tom LaStrange        Initial Version.