]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.303 v7.4.303
authorBram Moolenaar <Bram@vim.org>
Thu, 22 May 2014 14:05:19 +0000 (16:05 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 22 May 2014 14:05:19 +0000 (16:05 +0200)
Problem:    When using double-width characters the text displayed on the
            command line is sometimes truncated.
Solution:   Reset the string lenght. (Nobuhiro Takasaki)

src/screen.c
src/version.c

index 78e439944a16c9d74f398dfdd498d6d3211bc7fd..aea3f75a49ec91f27358af2968505c5e29d21594 100644 (file)
@@ -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
index 1c1aa2b39929a08b90b7d2aa130db754d1887423..efdb1964b789bf4d29cfe574275dbdec29d24714 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    303,
 /**/
     302,
 /**/