Merge branch 'NetHack-3.6'

# Conflicts:
#	DEVEL/Developer.txt
#	include/config.h
#	include/decl.h
#	include/display.h
#	include/extern.h
#	include/global.h
#	include/hack.h
#	include/patchlevel.h
#	src/display.c
#	src/dothrow.c
#	src/makemon.c
#	src/monst.c
#	src/objnam.c
#	src/sp_lev.c
#	src/wield.c
#	src/zap.c
#	sys/share/pmatchregex.c
#	sys/winnt/Makefile.msc

sys/winnt/nttty.c

@@ -398,12 +398,10 @@ int mode; // unused
 {
     DWORD cmode;
 
-#ifndef NEW_KEYBOARD_HIT
     /* Initialize the function pointer that points to
      * the kbhit() equivalent, in this TTY case nttty_kbhit()
      */
     nt_kbhit = nttty_kbhit;
-#endif
 
     if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE)) {
         /* Unable to set control handler */
@@ -438,19 +436,11 @@ int portdebug;
     return ch;
 }
 
-#ifndef NEW_KEYBOARD_HIT
 int
 nttty_kbhit()
 {
     return keyboard_handler.pNHkbhit(console.hConIn, &ir);
 }
-#else
-boolean
-tkbhit()
-{
-    return keyboard_handler.pNHkbhit(console.hConIn, &ir) != 0;
-}
-#endif
 
 int
 tgetch()