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

win/share/safeproc.c

@@ -101,9 +101,6 @@ struct window_procs safe_procs = {
     safe_status_update,
 #endif
     safe_can_suspend,
-#ifdef NEW_KEYBOARD_HIT
-    safe_keyboard_hit
-#endif
 };
 
 struct window_procs *
@@ -389,14 +386,6 @@ safe_can_suspend()
     return FALSE;
 }
 
-#ifdef NEW_KEYBOARD_HIT
-boolean
-safe_keyboard_hit()
-{
-    return FALSE;
-}
-#endif
-
 void
 safe_nhbell()
 {