diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-08-07 20:00:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-08-07 20:00:31 +0000 |
| commit | 1b0b07f29e5762f14f22f5d99dd4aba011785c74 (patch) | |
| tree | 34ad2c3ca4d19f8ce5d0dbc8d075b462d60d8bbf | |
| parent | 452a81b4138c18ffbec4cd53274f42b88fd9983d (diff) | |
updated for version 7.1-056v7.1.056
| -rw-r--r-- | src/message.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/message.c b/src/message.c index 609922a2f2..ba408a6d5b 100644 --- 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 5be707f122..ed6230db63 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 56, +/**/ 55, /**/ 54, |