patch 8.0.1355: cursor keys don't work in MS-Windows console

Problem:    Cursor keys don't work in MS-Windows console.
Solution:   Revert the previous patch.  Also delete dead code.

diff --git a/src/os_win32.c b/src/os_win32.c
index c1c297a63dfe17ec9a7b5d1806997cd0b45c89d6..22a2abc8f92bb52209f91311d526fde6b26f0e55 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1789,7 +1789,6 @@ mch_inchar(
 #endif
            {
                int     n = 1;
-               int     conv = FALSE;
 
 #ifdef FEAT_MBYTE
                if (ch2 == NUL)
@@ -1817,40 +1816,9 @@ mch_inchar(
                    typeahead[typeaheadlen] = c;
                if (ch2 != NUL)
                {
-                   if (c == K_NUL)
-                   {
-                       /* fAnsiKey */
-                       typeahead[typeaheadlen + n] = (char_u)ch2;
-                       n++;
-                   }
-                   else
-                   {
-                       typeahead[typeaheadlen + n] = 3;
-                       typeahead[typeaheadlen + n + 1] = (char_u)ch2;
-                       n += 2;
-                   }
-               }
-
-               if (conv)
-               {
-                   char_u *p = typeahead + typeaheadlen;
-
-                   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;
-                       }
-                   }
+                   typeahead[typeaheadlen + n] = 3;
+                   typeahead[typeaheadlen + n + 1] = (char_u)ch2;
+                   n += 2;
                }
 
                /* Use the ALT key to set the 8th bit of the character

diff --git a/src/version.c b/src/version.c
index 4f9d0b190593474068a69178ddc429bc39b76ead..0be4be46bb1f3a2f3018e6e255b0e64b23efc51a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1355,
 /**/
     1354,
 /**/