updated for version 7.1-056

diff --git a/src/message.c b/src/message.c
index 609922a2f2b721d3afc8dc5ed8b6df820742879f..ba408a6d5b6b2c9dd52a78ddfa4c6454c15eb228 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1878,7 +1878,7 @@ msg_puts_display(str, maxlen, attr, recurse)
                /* output postponed text */
                t_puts(&t_col, t_s, s, attr);
 
-           /* When no more prompt an no more room, truncate here */
+           /* When no more prompt and no more room, truncate here */
            if (msg_no_more && lines_left == 0)
                break;
 
@@ -1927,7 +1927,8 @@ msg_puts_display(str, maxlen, attr, recurse)
             * If screen is completely filled and 'more' is set then wait
             * for a character.
             */
-           --lines_left;
+           if (lines_left > 0)
+               --lines_left;
            if (p_more && lines_left == 0 && State != HITRETURN
                                            && !msg_no_more && !exmode_active)
            {
@@ -2234,7 +2235,7 @@ show_sb_text()
 {
     msgchunk_T *mp;
 
-    /* Only show somethign if there is more than one line, otherwise it looks
+    /* Only show something if there is more than one line, otherwise it looks
      * weird, typing a command without output results in one line. */
     mp = msg_sb_start(last_msgchunk);
     if (mp == NULL || mp->sb_prev == NULL)
@@ -2622,7 +2623,7 @@ do_more_prompt(typed_char)
                }
            }
 
-           if (scroll < 0 || (scroll == 0 && mp_last != NULL))
+           if (scroll <= 0)
            {
                /* displayed the requested text, more prompt again */
                screen_fill((int)Rows - 1, (int)Rows, 0,

diff --git a/src/version.c b/src/version.c
index 5be707f1223dc186b3284b01609c3da26851f06c..ed6230db6368614c7fa0d5f1671f231524fcab12 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    56,
 /**/
     55,
 /**/