updated for version 7.4.589

Problem:    In the MS-Windows console Vim can't handle greek characters when
            encoding is utf-8.
Solution:   Escape K_NUL. (Yasuhiro Matsumoto)

diff --git a/src/os_win32.c b/src/os_win32.c
index 939563805a9ecc87c632dd7f483a1654b5564f7c..ac25d7451ecb7459d35d113b88d2473fcce75590 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1814,18 +1814,22 @@ mch_inchar(
                if (conv)
                {
                    char_u *p = typeahead + typeaheadlen;
-                   char_u *e = typeahead + TYPEAHEADLEN;
 
-                   while (*p && p < e)
+                   if (*p != K_NUL)
                    {
-                       if (*p == K_NUL)
+                       char_u *e = typeahead + TYPEAHEADLEN;
+
+                       while (*p && p < e)
                        {
+                           if (*p == K_NUL)
+                           {
+                               ++p;
+                               mch_memmove(p + 1, p, ((size_t)(e - p)) - 1);
+                               *p = 3;
+                               ++n;
+                           }
                            ++p;
-                           mch_memmove(p + 1, p, ((size_t)(e - p)) - 1);
-                           *p = 3;
-                           ++n;
                        }
-                       ++p;
                    }
                }
 

diff --git a/src/version.c b/src/version.c
index 2f08c2495cc29c35c44c562fff571dac7fdaf4e0..4e78e7f1dd309f65be1960f0b2ab699e873b37b6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    589,
 /**/
     588,
 /**/