diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-28 20:06:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-28 20:06:10 +0100 |
| commit | a45ff6caba706191b4fe328cab4c742ce17fa779 (patch) | |
| tree | e4bb2c87db243f4fa0d947bb839df5006d4d85b2 | |
| parent | 3660a10c73a6d716ae9fca21f7c5a3282ddc7c85 (diff) | |
| download | vim-git-a45ff6caba706191b4fe328cab4c742ce17fa779.tar.gz | |
patch 8.0.1355: cursor keys don't work in MS-Windows consolev8.0.1355
Problem: Cursor keys don't work in MS-Windows console.
Solution: Revert the previous patch. Also delete dead code.
| -rw-r--r-- | src/os_win32.c | 38 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 35 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index c1c297a63..22a2abc8f 100644 --- 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 4f9d0b190..0be4be46b 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1355, +/**/ 1354, /**/ 1353, |