diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-01-20 19:39:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-01-20 19:39:35 +0100 |
| commit | 1ec4dd41de276260cd1d934b8033804f2d2f0435 (patch) | |
| tree | 1a7be58d3799204cf3a9d249c415f84e17e5d692 | |
| parent | 4bde00c59575f7547ab59946aea527c5be067662 (diff) | |
updated for version 7.4.589v7.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)
| -rw-r--r-- | src/os_win32.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 939563805a..ac25d7451e 100644 --- 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 2f08c2495c..4e78e7f1dd 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 589, +/**/ 588, /**/ 587, |