Merge branch 'NetHack-3.6'

diff --cc win/curses/cursmesg.c
index 28c30ab744b61faf37364dd86ef80f1978f56172,d752223fa1a7114474ccada005899deba2b35e3e..503a5885564649043bdd1e4e55ca1147810d00ec
--- 1/win/curses/cursmesg.c
--- 2/win/curses/cursmesg.c
+++ b/win/curses/cursmesg.c
@@@ -615,8 -617,15 +617,15 @@@ curses_message_win_getline(const char *
          case '\n':
              (void) strncpy(answer, p_answer, buffer);
              answer[buffer - 1] = '\0';
 -            Strcpy(toplines, tmpbuf);
 +            Strcpy(g.toplines, tmpbuf);
              mesg_add_line(tmpbuf);
+ #if 1
+             /* position at end of current line so next message will be
+                written on next line regardless of whether it could fit here */
+             mx = border_space ? (width + 1) : (width - 1);
+             wmove(win, my, mx);
+ #else       /* after various other changes, this resulted in getline()
+              * prompt+answer being following by a blank message line */
              if (++my > maxy) {
                  scroll_window(MESSAGE_WIN);
                  my--;