From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 22 May 2014 14:05:19 +0000 (+0200)
Subject: updated for version 7.4.303
X-Git-Tag: v7.4.303
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4c21e6899b6e4d9d4e0b29fc43c604edd3bc507;p=vim

updated for version 7.4.303
Problem:    When using double-width characters the text displayed on the
            command line is sometimes truncated.
Solution:   Reset the string lenght. (Nobuhiro Takasaki)
---

diff --git a/src/screen.c b/src/screen.c
index 78e439944..aea3f75a4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6916,15 +6916,16 @@ screen_puts(text, row, col, attr)
  * a NUL.
  */
     void
-screen_puts_len(text, len, row, col, attr)
+screen_puts_len(text, textlen, row, col, attr)
     char_u	*text;
-    int		len;
+    int		textlen;
     int		row;
     int		col;
     int		attr;
 {
     unsigned	off;
     char_u	*ptr = text;
+    int		len = textlen;
     int		c;
 #ifdef FEAT_MBYTE
     unsigned	max_off;
@@ -7169,7 +7170,11 @@ screen_puts_len(text, len, row, col, attr)
 	    col += mbyte_cells;
 	    ptr += mbyte_blen;
 	    if (clear_next_cell)
+	    {
+		/* This only happens at the end, display one space next. */
 		ptr = (char_u *)" ";
+		len = -1;
+	    }
 	}
 	else
 #endif
diff --git a/src/version.c b/src/version.c
index 1c1aa2b39..efdb1964b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    303,
 /**/
     302,
 /**/