From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 5 Sep 2013 11:50:53 +0000 (+0200)
Subject: updated for version 7.4.019
X-Git-Tag: v7.4.019
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00b764aa4115271aa553c8443adc6cec6859e69e;p=vim

updated for version 7.4.019
Problem:    MS-Windows: File name completion doesn't work properly with
            Chinese characters. (Yue Wu)
Solution:   Take care of multi-byte characters when looking for the start of
            the file name. (Ken Takata)
---

diff --git a/src/edit.c b/src/edit.c
index 6f8dc49a3..0c6089b68 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -5183,8 +5183,14 @@ ins_complete(c)
 	}
 	else if (ctrl_x_mode == CTRL_X_FILES)
 	{
-	    while (--startcol >= 0 && vim_isfilec(line[startcol]))
-		;
+	    char_u	*p = line + startcol;
+
+	    /* Go back to just before the first filename character. */
+	    mb_ptr_back(line, p);
+	    while (vim_isfilec(PTR2CHAR(p)) && p >= line)
+		mb_ptr_back(line, p);
+	    startcol = p - line;
+
 	    compl_col += ++startcol;
 	    compl_length = (int)curs_col - startcol;
 	    compl_pattern = addstar(line + compl_col, compl_length,
diff --git a/src/version.c b/src/version.c
index abed94540..0e6dc1c80 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    19,
 /**/
     18,
 /**/