diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 2a267fe74..6c858a823 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.44 $ $NHDT-Date: 1559998716 2019/06/08 12:58:36 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.45 $ $NHDT-Date: 1560009340 2019/06/08 15:55:40 $ This fixes36.3 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.2 in May 2019. Please note, however, @@ -98,6 +98,11 @@ curses: when display windows get reconfigured (after setting align_status, curses: plug memory leak when getting a line of input is cancelled by ESC curses: after requesting a line of input from player, next line of message window could end up being skipped +curses: don't convert ^M (or or key) into ^J; both ^J and ^M + indicate end of input when typing a line of text but as nethack + commands, ^J means run toward bottom of screen (when number_pad is + off) and ^M is not bound to any command, so accidental won't + cause the hero to try to move tty: re-do one optimization used when status conditions have all been removed and remove another that tried to check whether condition text to be displayed next was the same as the existing value; sometimes new diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c index 24eaa3548..db4367938 100644 --- a/win/curses/cursmain.c +++ b/win/curses/cursmain.c @@ -143,6 +143,8 @@ curses_init_nhwindows(int *argcp UNUSED, #endif noecho(); raw(); + nonl(); /* don't force ^M into newline (^J); input accepts them both + * but as a command, accidental won't run South */ meta(stdscr, TRUE); orig_cursor = curs_set(0); keypad(stdscr, TRUE);