Merge branch 'NetHack-3.6'

diff --cc include/extern.h
Simple merge

diff --cc include/hack.h
Simple merge

diff --cc src/detect.c
Simple merge

diff --cc src/mapglyph.c
index 912c003b636063654814d4c989d255f4999dc409,388e318a0c8cbde7643257146e317a84165de7f8..c324d43d5ae3ca3eeffbc37371a462ab154bc047
--- 1/src/mapglyph.c
--- 2/src/mapglyph.c
+++ b/src/mapglyph.c
@@@ -300,8 -301,8 +301,8 @@@ const char *str
                              gv = (gv * 16) + ((int) (dp - hex) / 2);
                          else
                              break;
-                     so = mapglyph(gv, &ch, &oc, &os, 0, 0);
+                     so = mapglyph(gv, &ch, &oc, &os, 0, 0, 0);
 -                    *put++ = showsyms[so];
 +                    *put++ = g.showsyms[so];
                      /* 'str' is ready for the next loop iteration and '*str'
                         should not be copied at the end of this iteration */
                      continue;

diff --cc src/pager.c
Simple merge

diff --cc src/region.c
index 2e177291f6252f3e9e26530def1a56bb7fb964f4,fae8883ffb582fb532aadbbe9807fc68bbb00d79..63cb9ca29de96af14f69f138521b0300766ea00a
--- 1/src/region.c
--- 2/src/region.c
+++ b/src/region.c
@@@ -332,12 -334,17 +332,17 @@@ NhRegion *reg
  {
      register int i, x, y;
  
 -    for (i = 0; i < n_regions; i++)
 -        if (regions[i] == reg)
 +    for (i = 0; i < g.n_regions; i++)
 +        if (g.regions[i] == reg)
              break;
 -    if (i == n_regions)
 +    if (i == g.n_regions)
          return;
  
 -    if (--n_regions != i)
 -        regions[i] = regions[n_regions];
 -    regions[n_regions] = (NhRegion *) 0;
+     /* remove region before potential newsym() calls, but don't free it yet */
++    if (--g.n_regions != i)
++        g.regions[i] = g.regions[g.n_regions];
++    g.regions[g.n_regions] = (NhRegion *) 0;
+ 
      /* Update screen if necessary */
      reg->ttl = -2L; /* for visible_region_at */
      if (reg->visible)

diff --cc win/Qt/qt_win.cpp
Simple merge

diff --cc win/X11/winmap.c
Simple merge

diff --cc win/curses/cursdial.c
Simple merge

diff --cc win/curses/cursmain.c
Simple merge

diff --cc win/gem/wingem.c
Simple merge

diff --cc win/tty/wintty.c
Simple merge

diff --cc win/win32/mhmap.c
Simple merge

diff --cc win/win32/mswproc.c
Simple merge