pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
--- a/sys/amiga/.gitattributes
+++ b/sys/amiga/.gitattributes
@@ -0,0 +1 @@
+*.p filter=NHtext merge=NHsubst
--- a/sys/amiga/amidos.c
+++ b/sys/amiga/amidos.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amidos.c	$Date$  $Revision$ */
+/* NetHack 3.5	amidos.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amidos.c	$Date: 2009/05/06 10:48:29 $  $Revision: 1.6 $ */
 /*    SCCS Id: @(#)amidos.c     3.5    2000/01/12
 /* Copyright (c) Olaf Seibert, Nijmegen, The Netherlands, 1988,1990.    */
 /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1991,1992,1993,1996.  */
--- a/sys/amiga/amidos.p
+++ b/sys/amiga/amidos.p
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amidos.p	$Date$  $Revision$ */
+/* NetHack 3.5	amidos.p	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amidos.p	$Date: 2009/05/06 10:48:29 $  $Revision: 1.4 $ */
 /*    SCCS Id: @(#)amidos.p 	3.5    1993/01/08
 /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1992, 1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/amigst.c
+++ b/sys/amiga/amigst.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amigst.c	$Date$  $Revision$ */
+/* NetHack 3.5	amigst.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amigst.c	$Date: 2009/05/06 10:48:29 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)amigst.c     3.5    1993/01/08
 /*    Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993	  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/amimenu.c
+++ b/sys/amiga/amimenu.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amimenu.c	$Date$  $Revision$ */
+/* NetHack 3.5	amimenu.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amimenu.c	$Date: 2009/05/06 10:48:29 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)amimenu.c    3.5    1996/02/04		   */
 /*    Copyright (c) Olaf 'Rhialto' Seibert, 1989		   */
 /*    Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1992, 1993, 1996 */
--- a/sys/amiga/amirip.c
+++ b/sys/amiga/amirip.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amirip.c	$Date$  $Revision$ */
+/* NetHack 3.5	amirip.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amirip.c	$Date: 2012/01/24 04:26:20 $  $Revision: 1.7 $ */
 /* Copyright (c) Kenneth Lorber, Bethesda, Maryland 1991,1992,1993,1995,1996. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -182,12 +183,7 @@ time_t when;
    tomb_text(buf);

    /* Put $ on stone */
-    Sprintf(buf, "%ld Au",
-#ifndef GOLDOBJ
-		u.ugold);
-#else
-		done_money);
-#endif
+    Sprintf(buf, "%ld Au", done_money);
    buf[STONE_LINE_LEN] = 0; /* It could be a *lot* of gold :-) */
    tomb_text(buf);

--- a/sys/amiga/amisnd.c
+++ b/sys/amiga/amisnd.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amisnd.c	$Date$  $Revision$ */
+/* NetHack 3.5	amisnd.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amisnd.c	$Date: 2009/05/06 10:48:30 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)amisnd.c	3.5	2000/01/12*/
 /* 	Copyright (c) 1992, 1993, 1995 by Gregg Wonderly */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/amistack.c
+++ b/sys/amiga/amistack.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amistack.c	$Date$  $Revision$ */
+/* NetHack 3.5	amistack.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amistack.c	$Date: 2009/05/06 10:48:30 $  $Revision: 1.4 $ */
 /* SCCS Id: @(#)amistack.c	3.5	2000/05/03			*/
 /* Copyright (c) Janne Salmijärvi, Tampere, Finland, 2000		*/
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/sys/amiga/amitty.c
+++ b/sys/amiga/amitty.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amitty.c	$Date$  $Revision$ */
+/* NetHack 3.5	amitty.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amitty.c	$Date: 2009/05/06 10:48:30 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)amitty.c     3.5    2000/01/12
 /*    Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993,1996  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/amiwind.c
+++ b/sys/amiga/amiwind.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amiwind.c	$Date$  $Revision$ */
+/* NetHack 3.5	amiwind.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amiwind.c	$Date: 2009/05/06 10:48:30 $  $Revision: 1.5 $ */
 /*    SCCS Id: @(#)amiwind.c     3.5    2000/01/12
 /*    Copyright (c) Olaf Seibert (KosmoSoft), 1989, 1992	  */
 /*    Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993,1996  */
--- a/sys/amiga/amiwind.p
+++ b/sys/amiga/amiwind.p
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amiwind.p	$Date$  $Revision$ */
+/* NetHack 3.5	amiwind.p	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amiwind.p	$Date: 2009/05/06 10:48:31 $  $Revision: 1.3 $ */
 /*   SCCS Id: @(#)amiwind.p	3.5	1993/01/08		  */
 /*   Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993	  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/cvtsnd.c
+++ b/sys/amiga/cvtsnd.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	cvtsnd.c	$Date$  $Revision$ */
+/* NetHack 3.5	cvtsnd.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	cvtsnd.c	$Date: 2009/05/06 10:48:31 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)cvtsnd.c	3.5	1995/09/10                  */
 /* 	Copyright (c) 1995, Andrew Church, Olney, Maryland        */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/txt2iff.c
+++ b/sys/amiga/txt2iff.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	txt2iff.c	$Date$  $Revision$ */
+/* NetHack 3.5	txt2iff.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	txt2iff.c	$Date: 2009/05/06 10:48:31 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)txt2iff.c	3.5	1995/07/28	*/
 /* 	Copyright (c) 1995 by Gregg Wonderly, Naperville, Illinois */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/winami.c
+++ b/sys/amiga/winami.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winami.c	$Date$  $Revision$ */
+/* NetHack 3.5	winami.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winami.c	$Date: 2012/01/10 17:47:21 $  $Revision: 1.13 $ */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993,1996. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -578,11 +579,7 @@ amii_player_selection()
 		{
 		    flags.initrole = randrole();
 #if 0	/* OBSOLETE */
-#ifdef  TOURIST
 		    strcpy( pl_character, roles[ rnd( 11 ) ] );
-#else
-		    strcpy( pl_character, roles[ rnd( 10 ) ] );
-#endif
 #endif
 		    aredone = 1;
 		    amii_clear_nhwindow( WIN_BASE );
@@ -607,11 +604,7 @@ amii_player_selection()
 		case 1: /* Random Character */
 		    flags.initrole = randrole();
 #if 0	/* OBSOLETE */
-#ifdef  TOURIST
 		    strcpy( pl_character, roles[ rnd( 11 ) ] );
-#else
-		    strcpy( pl_character, roles[ rnd( 10 ) ] );
-#endif
 #endif
 		    amii_clear_nhwindow( WIN_BASE );
 		    CloseShWindow( cwin );
--- a/sys/amiga/winami.p
+++ b/sys/amiga/winami.p
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winami.p	$Date$  $Revision$ */
+/* NetHack 3.5	winami.p	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winami.p	$Date: 2009/05/06 10:48:33 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)winami.p	3.5 1993/01/08			 */
 /*    Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993	 */
 /* NetHack may be freely redistributed. See license for details. */
--- a/sys/amiga/winchar.c
+++ b/sys/amiga/winchar.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winchar.c	$Date$  $Revision$ */
+/* NetHack 3.5	winchar.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winchar.c	$Date: 2009/05/06 10:48:33 $  $Revision: 1.4 $ */
 /*    SCCS Id: @(#)winchar.c     3.5    1993/07/22			*/
 /*    Copyright (c) Olaf Seibert (KosmoSoft), 1989, 1992	  */
 /*    Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993	  */
--- a/sys/amiga/windefs.h
+++ b/sys/amiga/windefs.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	windefs.h	$Date$  $Revision$ */
+/* NetHack 3.5	windefs.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	windefs.h	$Date: 2009/05/06 10:48:34 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)windefs.h    3.5    1993/04/02 */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/winext.h
+++ b/sys/amiga/winext.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winext.h	$Date$  $Revision$ */
+/* NetHack 3.5	winext.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winext.h	$Date: 2009/05/06 10:48:35 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)winext.h    3.5    2000/01/12 */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/winfuncs.c
+++ b/sys/amiga/winfuncs.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winfuncs.c	$Date$  $Revision$ */
+/* NetHack 3.5	winfuncs.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winfuncs.c	$Date: 2012/01/10 17:47:21 $  $Revision: 1.8 $ */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993,1996. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -2080,12 +2081,7 @@ if(u.uz.dlevel != x){
 }
 }
 #endif
-    if(
-	WINVERS_AMIV
-#ifdef REINCARNATION
-	&& !Is_rogue_level(&u.uz)
-#endif
-    )
+    if(WINVERS_AMIV && !Is_rogue_level(&u.uz))
    {
 	amii_curs(win,x,y);
 	amiga_print_glyph(win,0,glyph);
@@ -2094,7 +2090,6 @@ if(u.uz.dlevel != x){
    {
 	/* map glyph to character and color */
    	(void) mapglyph(glyph, &och, &color, &special, x, y);
-				/* XXX next if should be ifdef REINCARNATION */
 	ch = (uchar)och;
 	if( WINVERS_AMIV ){			/* implies Rogue level here */
 	    amii_curs(win,x,y);
@@ -2105,10 +2100,8 @@ if(u.uz.dlevel != x){

 #ifdef TEXTCOLOR
 		/* Turn off color if rogue level. */
-# ifdef REINCARNATION
 	    if (Is_rogue_level(&u.uz))
 		color = NO_COLOR;
-#  endif

 	    amiga_print_glyph(win,color,ch);
 #else
--- a/sys/amiga/winkey.c
+++ b/sys/amiga/winkey.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winkey.c	$Date$  $Revision$ */
+/* NetHack 3.5	winkey.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winkey.c	$Date: 2009/05/06 10:48:37 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)winkey.c    3.5    1993/04/02 */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/winmenu.c
+++ b/sys/amiga/winmenu.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winmenu.c	$Date$  $Revision$ */
+/* NetHack 3.5	winmenu.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winmenu.c	$Date: 2009/05/06 10:48:38 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)winmenu.c	3.5	1996/02/17	*/
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993,1996. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/winproto.h
+++ b/sys/amiga/winproto.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winproto.h	$Date$  $Revision$ */
+/* NetHack 3.5	winproto.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winproto.h	$Date: 2012/01/24 04:26:20 $  $Revision: 1.4 $ */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/sys/amiga/winreq.c
+++ b/sys/amiga/winreq.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winreq.c	$Date$  $Revision$ */
+/* NetHack 3.5	winreq.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winreq.c	$Date: 2009/05/06 10:48:41 $  $Revision: 1.4 $ */
 /*    SCCS Id: @(#)winreq.c    3.5    1993/04/02 */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/winstr.c
+++ b/sys/amiga/winstr.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winstr.c	$Date$  $Revision$ */
+/* NetHack 3.5	winstr.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winstr.c	$Date: 2009/05/06 10:48:42 $  $Revision: 1.3 $ */
 /*    SCCS Id: @(#)winstr.c    3.5    1993/04/02 */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois,  1991,1992,1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/amiga/xpm2iff.c
+++ b/sys/amiga/xpm2iff.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	xpm2iff.c	$Date$  $Revision$ */
+/* NetHack 3.5	xpm2iff.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	xpm2iff.c	$Date: 2009/05/06 10:48:44 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)xpm2iff.c	3.5	1995/08/04	*/
 /* 	Copyright (c) 1995 by Gregg Wonderly, Naperville, Illinois */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/atari/tos.c
+++ b/sys/atari/tos.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tos.c	$Date$  $Revision$ */
+/* NetHack 3.5	tos.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tos.c	$Date: 2009/05/06 10:48:51 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)tos.c	3.5	1990/14/08
 /* NetHack may be freely redistributed.  See license for details. */

--- a/sys/be/bemain.c
+++ b/sys/be/bemain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	bemain.c	$Date$  $Revision$ */
+/* NetHack 3.5	bemain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	bemain.c	$Date: 2009/05/06 10:48:59 $  $Revision: 1.11 $ */
 /*	SCCS Id: @(#)bemain.c	3.5	2008/01/30	*/
 /* Copyright (c) Dean Luick, 1996. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -160,10 +161,8 @@ static void process_options(int argc, char **argv)
 		argc--;
 		switch (argv[0][1]) {
 		case 'D':
-#ifdef WIZARD
 			wizard = TRUE, discover = FALSE;
 			break;
-#endif
 			/* otherwise fall thru to discover */
 		case 'X':
 			discover = TRUE, wizard = FALSE;
@@ -252,12 +251,8 @@ void getlock(void)
 boolean
 authorize_wizard_mode()
 {
-#ifdef WIZARD
 	/* other ports validate user name or character name here */
 	return TRUE;
-#else
-	return FALSE;
-#endif
 }

 #ifndef __begui__
--- a/sys/mac/.gitattributes
+++ b/sys/mac/.gitattributes
@@ -0,0 +1 @@
+NHDeflts filter=NHtext merge=NHsubst
--- a/sys/mac/NHDeflts
+++ b/sys/mac/NHDeflts
@@ -1,4 +1,5 @@
-# NetHack 3.5	NHDeflts	$Date$  $Revision$
+# NetHack 3.5	NHDeflts	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	NHDeflts	$Date: 2009/05/06 10:49:09 $  $Revision: 1.4 $
 # SCCS Id: @(#)NetHack Defaults	3.5	2002/03/15
 # Copyright (c) 2002 by Dean Luick, Mark Modrall, and Kevin Hugo
 # NetHack may be freely redistributed.  See license for details.
--- a/sys/mac/dprintf.c
+++ b/sys/mac/dprintf.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	dprintf.c	$Date$  $Revision$ */
+/* NetHack 3.5	dprintf.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	dprintf.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)dprintf.c	3.5	1994/01/29		  */
 /* Copyright (c) Jon W{tte, 1993.				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/maccurs.c
+++ b/sys/mac/maccurs.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	maccurs.c	$Date$  $Revision$ */
+/* NetHack 3.5	maccurs.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	maccurs.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)maccurs.c	3.5	1993/01/24		  */
 /* Copyright (c) Jon W{tte, 1992.				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macerrs.c
+++ b/sys/mac/macerrs.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macerrs.c	$Date$  $Revision$ */
+/* NetHack 3.5	macerrs.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macerrs.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)macerrs.c	3.5	1993/01/24		  */
 /* Copyright (c) Michael Hamel, 1991 */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macfile.c
+++ b/sys/mac/macfile.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macfile.c	$Date$  $Revision$ */
+/* NetHack 3.5	macfile.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macfile.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)macfile.c	3.5	1993/01/24		  */
 /* Copyright (c) Jon W{tte, Hao-Yang Wang, Jonathan Handler 1992. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macmain.c
+++ b/sys/mac/macmain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macmain.c	$Date$  $Revision$ */
+/* NetHack 3.5	macmain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macmain.c	$Date: 2009/05/06 10:49:11 $  $Revision: 1.15 $ */
 /*	SCCS Id: @(#)macmain.c	3.5	2008/01/30	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -283,12 +284,8 @@ finder_file_request(void)
 boolean
 authorize_wizard_mode()
 {
-#ifdef WIZARD
 	/* other ports validate user name or character name here */
 	return TRUE;
-#else
-	return FALSE;
-#endif
 }

 /*macmain.c*/
--- a/sys/mac/macmenu.c
+++ b/sys/mac/macmenu.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macmenu.c	$Date$  $Revision$ */
+/* NetHack 3.5	macmenu.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macmenu.c	$Date: 2009/05/06 10:49:13 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)macmenu.c	3.5	1999/11/24	*/
 /*      Copyright (c) Macintosh NetHack Port Team, 1993.          */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -618,9 +619,7 @@ void mac_askname ()
 	    fatal("\pCannot create mode menu");
 	AppendMenu(askmenu[RSRC_ASK_MODE], "\pNormal");
 	AppendMenu(askmenu[RSRC_ASK_MODE], "\pExplore");
-#ifdef WIZARD
 	AppendMenu(askmenu[RSRC_ASK_MODE], "\pDebug");
-#endif
 	InsertMenu(askmenu[RSRC_ASK_MODE], hierMenu);
 	currmode = 0;

@@ -707,9 +706,7 @@ void mac_askname ()
 	    /* Adjust the mode popup menu */
 	    CheckMenuItem(askmenu[RSRC_ASK_MODE], 1, currmode == 0);
 	    CheckMenuItem(askmenu[RSRC_ASK_MODE], 2, currmode == 1);
-#ifdef WIZARD
 	    CheckMenuItem(askmenu[RSRC_ASK_MODE], 3, currmode == 2);
-#endif

 	    /* Wait for an action on an item */
 	    ModalDialog(filter, &item);
@@ -772,22 +769,17 @@ void mac_askname ()
 	DisposeUserItemUPP(redraw);

 	/* Process the mode */
-#ifdef WIZARD
-	wizard =
-#endif
-	discover = 0;
+	wizard = discover = 0;
 	switch (currmode) {
 	case 0:		/* Normal */
 	    break;
 	case 1:		/* Explore */
 	    discover = 1;
 	    break;
-#ifdef WIZARD
 	case 2:		/* Debug */
 	    wizard = 1;
-	    strcpy(plname, WIZARD);
+	    strcpy(plname, WIZARD_NAME);
 	    break;
-#endif
 	default:	/* Quit */
 	    ExitToShell();
 	}
@@ -934,7 +926,6 @@ AdjustMenus(short dimMenubar)

 	if (newMenubar != mbarRegular)
 		;							/* we've already found its state */
-#ifdef WIZARD
 	else if (wizard)
 	{
 		newMenubar = mbarSpecial;
@@ -946,7 +937,6 @@ AdjustMenus(short dimMenubar)
 			SetMenuItemText(MHND_FILE, menuFilePlayMode, "\pDebug");
 		}
 	}
-#endif

 	else if (discover)
 	{
--- a/sys/mac/macsnd.c
+++ b/sys/mac/macsnd.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macsnd.c	$Date$  $Revision$ */
+/* NetHack 3.5	macsnd.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macsnd.c	$Date: 2009/05/06 10:49:14 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)macsnd.c	3.5	1992/11/28	*/
 /* 	Copyright (c) 1992 by Jon Watte */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mactopl.c
+++ b/sys/mac/mactopl.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mactopl.c	$Date$  $Revision$ */
+/* NetHack 3.5	mactopl.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mactopl.c	$Date: 2009/05/06 10:49:14 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)mactopl.c	3.5	1991/07/23 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mactty.c
+++ b/sys/mac/mactty.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mactty.c	$Date$  $Revision$ */
+/* NetHack 3.5	mactty.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mactty.c	$Date: 2009/05/06 10:49:14 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)mactty.c	3.5	1993/03/01			*/
 /* Copyright (c) Jon W{tte 1993.					*/
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/sys/mac/macunix.c
+++ b/sys/mac/macunix.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macunix.c	$Date$  $Revision$ */
+/* NetHack 3.5	macunix.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macunix.c	$Date: 2009/05/06 10:49:16 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)macunix.c	3.5	1994/11/07	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macwin.c
+++ b/sys/mac/macwin.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macwin.c	$Date$  $Revision$ */
+/* NetHack 3.5	macwin.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macwin.c	$Date: 2012/01/10 17:47:23 $  $Revision: 1.22 $ */
 /* Copyright (c) Jon W{tte, Hao-Yang Wang, Jonathan Handler 1992. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/sys/mac/mgetline.c
+++ b/sys/mac/mgetline.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mgetline.c	$Date$  $Revision$ */
+/* NetHack 3.5	mgetline.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mgetline.c	$Date: 2009/05/06 10:49:18 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)getline.c	3.5	1990/22/02 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mmodal.c
+++ b/sys/mac/mmodal.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mmodal.c	$Date$  $Revision$ */
+/* NetHack 3.5	mmodal.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mmodal.c	$Date: 2009/05/06 10:49:18 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)mmodal.c	3.5	1993/01/24		  */
 /* Copyright (c) Jon W{tte, Hao-Yang Wang, Jonathan Handler 1992. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mrecover.c
+++ b/sys/mac/mrecover.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mrecover.c	$Date$  $Revision$ */
+/* NetHack 3.5	mrecover.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mrecover.c	$Date: 2009/05/06 10:49:19 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)mrecover.c	3.5		1996/07/24	  */
 /*      Copyright (c) David Hairston, 1993.                       */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mttymain.c
+++ b/sys/mac/mttymain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mttymain.c	$Date$  $Revision$ */
+/* NetHack 3.5	mttymain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mttymain.c	$Date: 2009/05/06 10:49:20 $  $Revision: 1.8 $ */
 /*	SCCS Id: @(#)mttymain.c	3.5	1993/02/26			*/
 /* Copyright (c) Jon W{tte, 1993					*/
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/sys/msdos/.gitattributes
+++ b/sys/msdos/.gitattributes
@@ -0,0 +1,4 @@
+*.BC filter=NHtext merge=NHsubst
+*.bat filter=NHtext merge=NHsubst
+Makefile.* filter=NHtext merge=NHsubst
+Install.* filter=NHtext merge=NHsubst
--- a/sys/msdos/Install.dos
+++ b/sys/msdos/Install.dos
@@ -7,7 +7,8 @@
 		     NetHack 3.5 on a DOS system
         ======================================================
                   (or, How to make PC NetHack 3.5)
-                 Last revision: $Date$
+                 Last revision: $NHDT-Date$
+                 Last revision: $Date: 2005/01/02 17:16:53 $

 Credit for a runnable full PC NetHack 3.5 goes to the PC Development team
 of Paul Winner, Kevin Smolkowski, Michael Allison, Yitzhak Sapir, Bill Dyer, 
--- a/sys/msdos/Makefile.BC
+++ b/sys/msdos/Makefile.BC
@@ -1,4 +1,5 @@
-# NetHack 3.5	Makefile.BC	$Date$  $Revision$
+# NetHack 3.5	Makefile.BC	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Makefile.BC	$Date: 2012/01/10 17:47:26 $  $Revision: 1.14 $
 # Copyright (c) Yitzhak Sapir, 1999-2006.
 # NetHack may be freely distributed.  See license for details.
 #
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -1,4 +1,5 @@
-# NetHack 3.5	Makefile.GCC	$Date$  $Revision$
+# NetHack 3.5	Makefile.GCC	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Makefile.GCC	$Date: 2012/01/10 17:47:26 $  $Revision: 1.25 $
 #	Copyright (c) NetHack PC Development Team 1996-2006.
 #	PC NetHack 3.5 Makefile for djgpp V2
 #
--- a/sys/msdos/Makefile.MSC
+++ b/sys/msdos/Makefile.MSC
@@ -1,4 +1,5 @@
-# NetHack 3.5	Makefile.MSC	$Date$  $Revision$
+# NetHack 3.5	Makefile.MSC	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Makefile.MSC	$Date: 2012/01/22 06:27:07 $  $Revision: 1.18 $
 #	Copyright (c) NetHack PC Development Team 1997 - 2012.
 #	PC NetHack 3.4x Makefile for MSC V1.52c (16 bit compiler)
 #
--- a/sys/msdos/msdos.c
+++ b/sys/msdos/msdos.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	msdos.c	$Date$  $Revision$ */
+/* NetHack 3.5	msdos.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	msdos.c	$Date: 2012/01/22 06:27:07 $  $Revision: 1.7 $ */
 /* Copyright (c) NetHack PC Development Team 1990 */
 /* NetHack may be freely redistributed.  See license for details.         */

--- a/sys/msdos/ovlinit.c
+++ b/sys/msdos/ovlinit.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	ovlinit.c	$Date$  $Revision$ */
+/* NetHack 3.5	ovlinit.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	ovlinit.c	$Date: 2009/05/06 10:49:38 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)ovlinit.c	3.5	1994/03/20	          */
 /* Copyright (c) NetHack PC Development Team 1995                 */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/pckeys.c
+++ b/sys/msdos/pckeys.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pckeys.c	$Date$  $Revision$ */
+/* NetHack 3.5	pckeys.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pckeys.c	$Date: 2009/05/06 10:49:39 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)pckeys.c	 3.5	 1996/05/11		  */
 /* Copyright (c) NetHack PC Development Team 1996                 */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -55,24 +56,16 @@ unsigned char shift;
 			vga_userpan(0);
 		break;
 	case 0x3E:	/* F4 = toggle overview mode */
-		if (iflags.tile_view && 
-		    !opening_dialog
-#ifdef REINCARNATION
-				&& !Is_rogue_level(&u.uz)
-#endif
-							) {
+		if (iflags.tile_view && !opening_dialog
+                    && !Is_rogue_level(&u.uz)) {
 			iflags.traditional_view = FALSE;
 			vga_overview(iflags.over_view ? FALSE : TRUE);
 			vga_refresh();
 		}
 		break;
 	case 0x3F:	/* F5 = toggle traditional mode */
-		if (iflags.tile_view &&
-		    !opening_dialog
-#ifdef REINCARNATION
-				&& !Is_rogue_level(&u.uz)
-#endif
-							) {
+		if (iflags.tile_view && !opening_dialog
+                        && !Is_rogue_level(&u.uz)) {
 			iflags.over_view = FALSE;
 			vga_traditional(iflags.traditional_view ? FALSE : TRUE);
 			vga_refresh();
--- a/sys/msdos/pctiles.c
+++ b/sys/msdos/pctiles.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pctiles.c	$Date$  $Revision$ */
+/* NetHack 3.5	pctiles.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pctiles.c	$Date: 2009/05/06 10:49:39 $  $Revision: 1.5 $ */
 /*   SCCS Id: @(#)pctiles.c   3.5     1995/07/31		     */
 /*   Copyright (c) NetHack PC Development Team 1993, 1994           */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/pctiles.h
+++ b/sys/msdos/pctiles.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pctiles.h	$Date$  $Revision$ */
+/* NetHack 3.5	pctiles.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pctiles.h	$Date: 2009/05/06 10:49:40 $  $Revision: 1.4 $ */
 /*   SCCS Id: @(#)pctiles.h   3.5     1994/04/04                        */
 /*   Copyright (c) NetHack PC Development Team 1993, 1994             */
 /*   NetHack may be freely redistributed.  See license for details.   */
--- a/sys/msdos/pcvideo.h
+++ b/sys/msdos/pcvideo.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pcvideo.h	$Date$  $Revision$ */
+/* NetHack 3.5	pcvideo.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pcvideo.h	$Date: 2009/05/06 10:49:40 $  $Revision: 1.4 $ */
 /*   SCCS Id: @(#)pcvideo.h   3.5     1994/06/07                      */
 /*   Copyright (c) NetHack PC Development Team 1993, 1994           */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/portio.h
+++ b/sys/msdos/portio.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	portio.h	$Date$  $Revision$ */
+/* NetHack 3.5	portio.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	portio.h	$Date: 2009/05/06 10:49:41 $  $Revision: 1.4 $ */
 /*   SCCS Id: @(#)portio.h   3.5     1995/08/05                       */
 /*   Copyright (c) NetHack PC Development Team 1995                 */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/schema1.BC
+++ b/sys/msdos/schema1.BC
@@ -1,4 +1,5 @@
-/* NetHack 3.5	schema1.BC	$Date$  $Revision$ */
+/* NetHack 3.5	schema1.BC	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	schema1.BC	$Date: 2009/05/06 10:49:41 $  $Revision: 1.5 $ */
 /* SCCS Id: @(#)schema1.BC	3.5	 2008/01/30 */
 /* Copyright (c) Yitzhak Sapir, 1999 */
 /*  */
--- a/sys/msdos/schema2.BC
+++ b/sys/msdos/schema2.BC
@@ -1,4 +1,5 @@
-/* NetHack 3.5	schema2.BC	$Date$  $Revision$ */
+/* NetHack 3.5	schema2.BC	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	schema2.BC	$Date: 2009/05/06 10:49:42 $  $Revision: 1.5 $ */
 /* SCCS Id: @(#)schema2.BC	3.5	 2008/01/30 */
 /* Copyright (c) Yitzhak Sapir, 1999 */
 /*  */
--- a/sys/msdos/setup.bat
+++ b/sys/msdos/setup.bat
@@ -1,5 +1,6 @@
@echo off
-REM    NetHack 3.5 setup.bat   $Date$ $Revision$
+REM    NetHack 3.5 setup.bat   $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
+REM    NetHack 3.5 setup.bat   $Date: 2012/01/22 06:27:07 $ $Revision: 1.3 $
 REM    Copyright (c) NetHack PC Development Team 1990 - 2012
 REM    NetHack may be freely redistributed.  See license for details.

--- a/sys/msdos/sound.c
+++ b/sys/msdos/sound.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	sound.c	$Date$  $Revision$ */
+/* NetHack 3.5	sound.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	sound.c	$Date: 2009/05/06 10:49:43 $  $Revision: 1.4 $ */
 /*   SCCS Id: @(#)sound.c   3.5     1996/02/19                        */
 /*   Copyright (c) NetHack PC Development Team 1993,1995            */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/tile2bin.c
+++ b/sys/msdos/tile2bin.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tile2bin.c	$Date$  $Revision$ */
+/* NetHack 3.5	tile2bin.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tile2bin.c	$Date: 2009/05/06 10:49:47 $  $Revision: 1.4 $ */
 /*   SCCS Id: @(#)tile2bin.c   3.5     1995/01/26                     */
 /*   Copyright (c) NetHack PC Development Team 1993, 1994, 1995     */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/video.c
+++ b/sys/msdos/video.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	video.c	$Date$  $Revision$ */
+/* NetHack 3.5	video.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	video.c	$Date: 2009/05/06 10:49:49 $  $Revision: 1.6 $ */
 /*   SCCS Id: @(#)video.c   3.5     2001/04/07			    */
 /*   Copyright (c) NetHack PC Development Team 1993, 1994, 2001	    */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/vidtxt.c
+++ b/sys/msdos/vidtxt.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vidtxt.c	$Date$  $Revision$ */
+/* NetHack 3.5	vidtxt.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vidtxt.c	$Date: 2009/05/06 10:49:49 $  $Revision: 1.6 $ */
 /*   SCCS Id: @(#)vidtxt.c   3.5     1994/04/04                     */
 /*   Copyright (c) NetHack PC Development Team 1993                 */
 /*   NetHack may be freely redistributed.  See license for details. */
--- a/sys/msdos/vidvga.c
+++ b/sys/msdos/vidvga.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vidvga.c	$Date$  $Revision$ */
+/* NetHack 3.5	vidvga.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vidvga.c	$Date: 2009/05/06 10:49:50 $  $Revision: 1.9 $ */
 /*   SCCS Id: @(#)vidvga.c   3.5     2006/07/08			  */
 /*   Copyright (c) NetHack PC Development Team 1995                 */
 /*   NetHack may be freely redistributed.  See license for details. */
@@ -1170,14 +1171,9 @@ vga_DrawCursor()
 	unsigned char first,second;
 /*	char on[2] =  {0xFF,0xFF}; */
 /*	char off[2] = {0x00,0x00}; */
-#ifdef REINCARNATION
 	boolean isrogue = Is_rogue_level(&u.uz);
 	boolean singlebyte = (isrogue || iflags.over_view
 			      || iflags.traditional_view || !inmap);
-#else
-	boolean singlebyte = (iflags.over_view
-			      || iflags.traditional_view || !inmap);
-#endif
 	int curtyp;

 	if (!cursor_type && inmap) return;	/* CURSOR_INVIS - nothing to do */
@@ -1375,14 +1371,9 @@ vga_HideCursor()
 	int i,pixx,pixy,x,y;
 	char __far *tmp1;
 	char __far *tmp2;
-#ifdef REINCARNATION
 	boolean isrogue = Is_rogue_level(&u.uz);
 	boolean singlebyte = (isrogue || iflags.over_view
 			      || iflags.traditional_view || !inmap);
-#else
-	boolean singlebyte = (iflags.over_view
-			      || iflags.traditional_view || !inmap);
-#endif
 	int curtyp;
 	
 	if (inmap && !cursor_type) return;	/* CURSOR_INVIS - nothing to do */
--- a/sys/os2/.gitattributes
+++ b/sys/os2/.gitattributes
@@ -0,0 +1 @@
+Makefile.* filter=NHtext merge=NHsubst
--- a/sys/os2/Makefile.os2
+++ b/sys/os2/Makefile.os2
@@ -1,4 +1,5 @@
-# NetHack 3.5	Makefile.os2	$Date$  $Revision$
+# NetHack 3.5	Makefile.os2	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Makefile.os2	$Date: 2012/01/10 17:47:28 $  $Revision: 1.16 $
 #	OS/2 NetHack 3.5 Makefile for OS/2 versions 1.x and 2.x
 #	Copyright (C) 1990, 1991, 1992, 1993, 1996 Timo Hakulinen
 #
--- a/sys/os2/os2.c
+++ b/sys/os2/os2.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	os2.c	$Date$  $Revision$ */
+/* NetHack 3.5	os2.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	os2.c	$Date: 2009/05/06 10:50:12 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)os2.c	3.5	1996/02/29 */
 /*	Copyright (c) Timo Hakulinen, 1990, 1991, 1992, 1993, 1996. */
 /*	NetHack may be freely redistributed.  See license for details. */
--- a/sys/share/.gitattributes
+++ b/sys/share/.gitattributes
@@ -0,0 +1 @@
+Makefile.* filter=NHtext merge=NHsubst
--- a/sys/share/Makefile.lib
+++ b/sys/share/Makefile.lib
@@ -1,4 +1,5 @@
-# NetHack 3.5	Makefile.lib	$Date$  $Revision$
+# NetHack 3.5	Makefile.lib	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Makefile.lib	$Date: 2009/05/06 10:50:26 $  $Revision: 1.4 $
 #	SCCS Id: @(#)Makefile.lib	3.5	1990/22/02
 #	Nethack makefile for Fred fish termlib -- Norman Meluch
 #
--- a/sys/share/NetHack.cnf
+++ b/sys/share/NetHack.cnf
@@ -1,6 +1,9 @@
 #	NetHack Copyright (c) NetHack PC Development Team 1993 - 2006
 #	NetHack may be freely redistributed.  See license for details.
 #
+# $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# $Date: 2006/09/23 04:40:09 $  $Revision: 1.7 $
+#
 # A '#' at the beginning of a line means the rest of the line is a comment.
 #
 # Some options MUST be set in this file, other options can be toggled while
--- a/sys/share/ioctl.c
+++ b/sys/share/ioctl.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	ioctl.c	$Date$  $Revision$ */
+/* NetHack 3.5	ioctl.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	ioctl.c	$Date: 2011/06/16 15:10:14 $  $Revision: 1.8 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/sys/share/nhlan.c
+++ b/sys/share/nhlan.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	nhlan.c	$Date$  $Revision$ */
+/* NetHack 3.5	nhlan.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	nhlan.c	$Date: 2009/05/06 10:50:26 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)nhlan.c	3.5	1999/11/21	*/
 /* Copyright (c) Michael Allison, 1997                  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pcmain.c	$Date$  $Revision$ */
+/* NetHack 3.5	pcmain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pcmain.c	$Date: 2012/01/20 03:41:31 $  $Revision: 1.48 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -302,19 +303,15 @@ char *argv[];
 	process_options(argc, argv);
 #endif

-#ifdef LOADSYMSETS
-# if defined(MSDOS) || defined(WIN32)
+#if defined(MSDOS) || defined(WIN32)
 	/* Player didn't specify any symbol set so use IBM defaults */
 	if (!symset[PRIMARY].name) {
 		load_symset("IBMGraphics_2", PRIMARY);
 	}
-#  ifdef REINCARNATION
 	if (!symset[ROGUESET].name) {
 		load_symset("RogueEpyx", ROGUESET);
 	}
-#  endif
-# endif
-#endif /*LOADSYMSETS*/
+#endif

 #ifdef MSDOS
 	init_nhwindows(&argc,argv);
@@ -537,20 +534,16 @@ char *argv[];
 		case 'I':
 		case 'i':
 			if (!strncmpi(argv[0]+1, "IBM", 3)) {
-# ifdef LOADSYMSETS
 				load_symset("IBMGraphics", PRIMARY);
 				load_symset("RogueIBM", ROGUESET);
 				switch_symbols(TRUE);
-# endif
 			}
 			break;
 	    /*	case 'D': */
 		case 'd':
 			if (!strncmpi(argv[0]+1, "DEC", 3)) {
-# ifdef LOADSYMSETS
 				load_symset("DECGraphics", PRIMARY);
 				switch_symbols(TRUE);
-# endif
 			}
 			break;
 #endif
@@ -703,21 +696,11 @@ port_help()
 # endif /* MSDOS || WIN32 */
 #endif /* PORT_HELP */

-/* for KR1ED config, WIZARD is 0 or 1 and WIZARD_NAME is a string;
-   for usual config, WIZARD is the string; forcing WIZARD_NAME to match it
-   eliminates conditional testing for which one to use in string ops */
-#ifndef KR1ED
-# undef WIZARD_NAME
-# define WIZARD_NAME WIZARD
-#endif
-
 /* validate wizard mode if player has requested access to it */
 boolean
 authorize_wizard_mode()
 {
-#ifdef WIZARD
 	if (!strcmp(plname, WIZARD_NAME)) return TRUE;
-#endif
 	return FALSE;
 }

--- a/sys/share/pcsys.c
+++ b/sys/share/pcsys.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pcsys.c	$Date$  $Revision$ */
+/* NetHack 3.5	pcsys.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pcsys.c	$Date: 2012/01/22 06:33:47 $  $Revision: 1.18 $ */
 /*	SCCS Id: @(#)pcsys.c	3.5	2002/01/22		  */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -406,7 +407,7 @@ const char *str;
 #else
 	msmsg("Hit <Enter> %s.", str);
 #endif
-	while (Getchar() != '\n') ;
+	while (pgetchar() != '\n') ;
 	return;
 }

--- a/sys/share/pctty.c
+++ b/sys/share/pctty.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pctty.c	$Date$  $Revision$ */
+/* NetHack 3.5	pctty.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pctty.c	$Date: 2009/05/06 10:50:30 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)pctty.c	3.5	1990/22/02
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/share/pcunix.c
+++ b/sys/share/pcunix.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pcunix.c	$Date$  $Revision$ */
+/* NetHack 3.5	pcunix.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pcunix.c	$Date: 2009/05/06 10:50:30 $  $Revision: 1.27 $ */
 /*	SCCS Id: @(#)pcunix.c	3.5	1994/11/07	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/share/random.c
+++ b/sys/share/random.c
@@ -32,6 +32,9 @@
 *	- remove useless variable `j' from srandom()
 *	- cast result of pointer subtraction to long since ptrdiff_t could
 *	be bigger than that and trigger warnings when assigning to long
+ *
+ * $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+ * $Date: 2007/12/23 00:59:25 $  $Revision: 1.2 $
 */

 #include "hack.h"
--- a/sys/share/tclib.c
+++ b/sys/share/tclib.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tclib.c	$Date$  $Revision$ */
+/* NetHack 3.5	tclib.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tclib.c	$Date: 2009/05/06 10:50:31 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)tclib.c	3.5	1996/02/25	*/
 /* Copyright (c) Robert Patrick Rankin, 1995			  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/share/unixtty.c
+++ b/sys/share/unixtty.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	unixtty.c	$Date$  $Revision$ */
+/* NetHack 3.5	unixtty.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	unixtty.c	$Date: 2012/01/23 07:11:09 $  $Revision: 1.10 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -363,11 +364,9 @@ init_sco_cons()
 	if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
 		atexit(sco_mapon);
 		sco_mapoff();
-#  ifdef LOADSYMSETS
 		load_symset("IBMGraphics", PRIMARY);
 		load_symset("RogueIBM", ROGUESET);
 		switch_symbols(TRUE);
-#  endif
 #  ifdef TEXTCOLOR
 		if (has_colors())
 			iflags.use_color = TRUE;
--- a/sys/share/uudecode.c
+++ b/sys/share/uudecode.c
@@ -41,6 +41,8 @@
 * Modified 08 July 2006 to cast strlen() result to int to suppress a
 * warning on platforms where size_t > sizeof(int).
 *
+ * $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+ * $Date: 2006/07/09 16:42:21 $  $Revision: 1.4 $
 */

 #ifndef lint
--- a/sys/unix/.gitattributes
+++ b/sys/unix/.gitattributes
@@ -0,0 +1 @@
+Makefile.* filter=NHtext merge=NHsubst
--- a/sys/unix/Makefile.dat
+++ b/sys/unix/Makefile.dat
@@ -1,5 +1,6 @@
 #	NetHack Makefile.
-# NetHack 3.5  Makefile.dat	$Date$  $Revision$
+# NetHack 3.5  Makefile.dat	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  Makefile.dat	$Date: 2012/01/10 17:47:30 $  $Revision: 1.11 $

 # Root of source tree:
 NHSROOT=..
--- a/sys/unix/Makefile.doc
+++ b/sys/unix/Makefile.doc
@@ -1,5 +1,6 @@
 #	NetHack Makefile.
-# NetHack 3.5  Makefile.doc	$Date$  $Revision$
+# NetHack 3.5  Makefile.doc	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  Makefile.doc	$Date: 2010/05/01 23:10:22 $  $Revision: 1.11 $

 # Root of source tree:
 NHSROOT=..
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -1,5 +1,6 @@
 #	NetHack Makefile.
-# NetHack 3.5  Makefile.src	$Date$  $Revision$
+# NetHack 3.5  Makefile.src	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  Makefile.src	$Date: 2012/01/20 03:41:33 $  $Revision: 1.37 $

 # Root of source tree:
 NHSROOT=..
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -1,5 +1,6 @@
 #	NetHack Makefile.
-# NetHack 3.5  Makefile.top	$Date$  $Revision$
+# NetHack 3.5  Makefile.top	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  Makefile.top	$Date: 2012/01/10 17:47:30 $  $Revision: 1.19 $

 # Root of source tree:
 NHSROOT=.
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -1,5 +1,6 @@
 #	Makefile for NetHack's utility programs.
-# NetHack 3.5  Makefile.utl	$Date$  $Revision$
+# NetHack 3.5  Makefile.utl	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  Makefile.utl	$Date: 2012/01/10 17:47:30 $  $Revision: 1.18 $

 # Root of source tree:
 NHSROOT=..
--- a/sys/unix/README.linux
+++ b/sys/unix/README.linux
@@ -1,5 +1,8 @@
 NetHack 3.5.0 Linux Elf

+$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$Date: 2005/01/02 17:17:28 $  $Revision: 1.16 $
+
 This README provides the instructions for using the official Linux binary,
 system platform requirements, as well as steps used to create that binary.
 The same steps can be used from the source distribution to create a similar
--- a/sys/unix/depend.awk
+++ b/sys/unix/depend.awk
@@ -1,5 +1,7 @@
 # depend.awk -- awk script used to construct makefile dependencies
 # for nethack's source files (`make depend' support for Makefile.src).
+# $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# $Date: 2005/12/15 03:42:52 $  $Revision: 1.3 $
 #
 # usage:
 #   cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files
--- a/sys/unix/hints/.gitattributes
+++ b/sys/unix/hints/.gitattributes
@@ -0,0 +1 @@
+* filter=NHtext merge=NHsubst
--- a/sys/unix/hints/linux
+++ b/sys/unix/hints/linux
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5  linux $Date$  $Revision$
+# NetHack 3.5  linux $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  linux $Date: 2010/01/15 19:54:37 $  $Revision: 1.8 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details. 
 #
--- a/sys/unix/hints/linux-x11
+++ b/sys/unix/hints/linux-x11
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5  linux-x11 $Date$  $Revision$
+# NetHack 3.5  linux-x11 $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  linux-x11 $Date: 2009/12/23 20:02:29 $  $Revision: 1.5 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details. 
 #
--- a/sys/unix/hints/macosx
+++ b/sys/unix/hints/macosx
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5  macosx $Date$  $Revision$
+# NetHack 3.5  macosx $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  macosx $Date: 2009/12/23 20:02:29 $  $Revision: 1.9 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/sys/unix/hints/macosx.sh
+++ b/sys/unix/hints/macosx.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# NetHack 3.5  macosx.sh $Date$  $Revision$
+# NetHack 3.5  macosx.sh $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  macosx.sh $Date: 2011/10/17 01:29:17 $  $Revision: 1.5 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/sys/unix/hints/macosx10.5
+++ b/sys/unix/hints/macosx10.5
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5  macosx10.5 $Date$  $Revision$
+# NetHack 3.5  macosx10.5 $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  macosx10.5 $Date: 2011/10/17 01:29:17 $  $Revision: 1.11 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/sys/unix/hints/macosx10.7
+++ b/sys/unix/hints/macosx10.7
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5  macosx10.7 $Date$  $Revision$
+# NetHack 3.5  macosx10.7 $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  macosx10.7 $Date: 2012/01/18 22:32:24 $  $Revision: 1.4 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/sys/unix/hints/unix
+++ b/sys/unix/hints/unix
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5 unix $Date$  $Revision$
+# NetHack 3.5 unix $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5 unix $Date: 2009/12/23 20:02:29 $  $Revision: 1.5 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details. 
 #
--- a/sys/unix/mkmkfile.sh
+++ b/sys/unix/mkmkfile.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# NetHack 3.5  mkmkfile.sh	$Date$  $Revision$
+# NetHack 3.5  mkmkfile.sh	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  mkmkfile.sh	$Date: 2011/12/27 00:34:52 $  $Revision: 1.5 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.

--- a/sys/unix/nethack.sh
+++ b/sys/unix/nethack.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# NetHack 3.5  nethack.sh	$Date$  $Revision$
+# NetHack 3.5  nethack.sh	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  nethack.sh	$Date: 2009/05/06 10:50:54 $  $Revision: 1.9 $
 #	SCCS Id: @(#)nethack.sh	3.5	2007/12/12

 HACKDIR=/usr/games/lib/nethackdir
--- a/sys/unix/setup.sh
+++ b/sys/unix/setup.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# NetHack 3.5  setup.sh	$Date$  $Revision$
+# NetHack 3.5  setup.sh	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5  setup.sh	$Date: 2011/12/27 00:34:52 $  $Revision: 1.6 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/sys/unix/sysconf
+++ b/sys/unix/sysconf
@@ -1,5 +1,6 @@
 #
-# NetHack 3.5 sysconf $Date$ $Revision$
+# NetHack 3.5 sysconf $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5 sysconf $Date: 2012/01/27 20:15:31 $ $Revision: 1.6 $
 #
 # Sample sysconf file.
 # The sysconf file is only used if NetHack is compiled with SYSCF defined.
@@ -13,6 +14,11 @@ WIZARDS=root games
 # Uses the same syntax as the WIZARDS option above.
 #SHELLERS=

+# Show debugging information originating from these source files.
+# Use '*' for all, or list source files separated by spaces.
+# Only available if game has been compiled with DEBUG.
+#DEBUGFILES=*
+
 # Limit the number of simultaneous games (see also nethack.sh).
 MAXPLAYERS=10

--- a/Show More
+++ b/Show More