Merge branch 'NetHack-3.6'

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

diff --cc win/curses/cursmesg.c
index 06f2fdaedf1b351b57fc6dcab75a8b1ab246eb27,0d67cff1c0397ba0dadb583ce6f21740f78e992b..1548e28183d7492aee866f4232af54c83a898828
--- 1/win/curses/cursmesg.c
--- 2/win/curses/cursmesg.c
+++ b/win/curses/cursmesg.c
@@@ -292,8 -306,12 +306,12 @@@ curses_last_messages(
          if (mesg && mesg->str && *mesg->str)
              curses_message_win_puts(mesg->str, TRUE);
      }
 -    curses_message_win_puts(toplines, TRUE);
 +    curses_message_win_puts(g.toplines, TRUE);
      --last_messages;
+ 
+     if (border)
+         box(win, 0, 0);
+     wrefresh(win);
  }