From: nhmall <nhmall@nethack.org>
Date: Tue, 28 May 2019 17:11:26 +0000 (-0400)
Subject: Merge branch 'NetHack-3.6'
X-Git-Tag: NetHack-3.7.0_WIP~396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cec0a67257509af8f617d11239d4f0802673496;p=nethack

Merge branch 'NetHack-3.6'
---

0cec0a67257509af8f617d11239d4f0802673496
diff --cc win/curses/cursmesg.c
index 28c30ab74,d752223fa..503a58855
--- a/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--;