thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.1-056

Browse Source
This commit is contained in:
Bram Moolenaar 2007-08-07 20:00:31 +00:00
parent 452a81b413
commit 1b0b07f29e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/message.c
View File

@ -1878,7 +1878,7 @@ msg_puts_display(str, maxlen, attr, recurse)
/* output postponed text */ /* output postponed text */
t_puts(&t_col, t_s, s, attr); 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) if (msg_no_more && lines_left == 0)
break; break;
@ -1927,6 +1927,7 @@ msg_puts_display(str, maxlen, attr, recurse)
* If screen is completely filled and 'more' is set then wait * If screen is completely filled and 'more' is set then wait
* for a character. * for a character.
*/ */
if (lines_left > 0)
--lines_left; --lines_left;
if (p_more && lines_left == 0 && State != HITRETURN if (p_more && lines_left == 0 && State != HITRETURN
&& !msg_no_more && !exmode_active) && !msg_no_more && !exmode_active)
@ -2234,7 +2235,7 @@ show_sb_text()
{ {
msgchunk_T *mp; 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. */ * weird, typing a command without output results in one line. */
mp = msg_sb_start(last_msgchunk); mp = msg_sb_start(last_msgchunk);
if (mp == NULL || mp->sb_prev == NULL) 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 */ /* displayed the requested text, more prompt again */
screen_fill((int)Rows - 1, (int)Rows, 0, screen_fill((int)Rows - 1, (int)Rows, 0,

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
56,
/**/ /**/
55, 55,
/**/ /**/