aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/screen.c8
-rw-r--r--src/nvim/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 88e1c2dd6d..54dcaff39e 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -5215,10 +5215,11 @@ void screen_puts(char_u *text, int row, int col, int attr)
* Like screen_puts(), but output "text[len]". When "len" is -1 output up to
* a NUL.
*/
-void screen_puts_len(char_u *text, int len, int row, int col, int attr)
+void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
{
unsigned off;
char_u *ptr = text;
+ int len = textlen;
int c;
unsigned max_off;
int mbyte_blen = 1;
@@ -5404,8 +5405,11 @@ void screen_puts_len(char_u *text, int len, int row, int col, int attr)
off += mbyte_cells;
col += mbyte_cells;
ptr += mbyte_blen;
- if (clear_next_cell)
+ if (clear_next_cell) {
+ // This only happens at the end, display one space next.
ptr = (char_u *)" ";
+ len = -1;
+ }
} else {
++off;
++col;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8816a5e3b2..a220791039 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -215,7 +215,7 @@ static int included_patches[] = {
//306,
//305,
//304,
- //303,
+ 303,
302,
301,
//300,