Merge fixes from 'NetHack-3.6' into NetHack-3.7-Jan2020

diff --cc include/patchlevel.h
Simple merge

diff --cc include/vmsconf.h
Simple merge

diff --cc src/end.c
Simple merge

diff --cc src/pline.c
index 4bf1419504a4b68a04bd5d11a668f0245f12f842,24bdea21181291d9340f106ef62603349efeaf4c..28d5dd4be1ecd90c9b1010cc0aec032d3480c467
--- 1/src/pline.c
--- 2/src/pline.c
+++ b/src/pline.c
@@@ -469,11 -493,15 +485,15 @@@ VA_DECL(const char *, s
  
      VA_START(s);
      VA_INIT(s, const char *);
 -    if (program_state.in_impossible)
 +    if (g.program_state.in_impossible)
          panic("impossible called impossible");
  
 -    program_state.in_impossible = 1;
 +    g.program_state.in_impossible = 1;
+ #if !defined(NO_VSNPRINTF)
+     (void) vsnprintf(pbuf, sizeof pbuf, s, VA_ARGS);
+ #else
      Vsprintf(pbuf, s, VA_ARGS);
+ #endif
      pbuf[BUFSZ - 1] = '\0'; /* sanity */
      paniclog("impossible", pbuf);
      if (iflags.debug_fuzzer)

diff --cc src/topten.c
Simple merge

diff --cc src/windows.c
Simple merge

diff --cc sys/unix/unixmain.c
Simple merge

diff --cc sys/winnt/nttty.c
Simple merge

diff --cc sys/winnt/winnt.c
Simple merge