summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-09-06 10:54:51 +0000
committerBram Moolenaar <Bram@vim.org>2007-09-06 10:54:51 +0000
commitc27c8d5c5915650d5d1a4c1b37b39cd6d28e3f76 (patch)
treeb258b178cbed08a4ee5d9e97827e4c0bfea6b30f /src
parent9c8791fde0dc9f8821db48a7ccf373fe90d506d9 (diff)
downloadvim-git-c27c8d5c5915650d5d1a4c1b37b39cd6d28e3f76.tar.gz
updated for version 7.1-096v7.1.096
Diffstat (limited to 'src')
-rw-r--r--src/message.c11
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/message.c b/src/message.c
index ba408a6d5..82b9c9aea 100644
--- a/src/message.c
+++ b/src/message.c
@@ -944,6 +944,7 @@ wait_return(redraw)
c = K_IGNORE;
}
#endif
+
/*
* Allow scrolling back in the messages.
* Also accept scroll-down commands when messages fill the screen,
@@ -1840,6 +1841,7 @@ msg_puts_display(str, maxlen, attr, recurse)
char_u *sb_str = str;
int sb_col = msg_col;
int wrap;
+ int did_last_char;
did_wait_return = FALSE;
while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
@@ -1909,7 +1911,10 @@ msg_puts_display(str, maxlen, attr, recurse)
else
#endif
msg_screen_putchar(*s++, attr);
+ did_last_char = TRUE;
}
+ else
+ did_last_char = FALSE;
if (p_more)
/* store text for scrolling back */
@@ -1944,11 +1949,7 @@ msg_puts_display(str, maxlen, attr, recurse)
/* When we displayed a char in last column need to check if there
* is still more. */
- if (*s >= ' '
-#ifdef FEAT_RIGHTLEFT
- && !cmdmsg_rl
-#endif
- )
+ if (did_last_char)
continue;
}
diff --git a/src/version.c b/src/version.c
index 82371a901..e1fc310cb 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 */
/**/
+ 96,
+/**/
95,
/**/
94,