thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.363

Browse Source 
Problem:    In Windows console typing 0xCE does not work.
Solution:   Convert 0xCE to K_NUL 3. (Nobuhiro Takasaki et al.)
This commit is contained in:
Bram Moolenaar
2014-07-09 20:51:07 +02:00
parent 1e1aca3784
commit 455009122a
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/os_win32.c
View File

@@ -619,7 +619,7 @@ win32_enable_privilege(LPTSTR lpszPrivilege, BOOL bEnable)
return FALSE;
}
tokenPrivileges.PrivilegeCount = 1;
tokenPrivileges.PrivilegeCount = 1;
tokenPrivileges.Privileges[0].Luid = luid;
tokenPrivileges.Privileges[0].Attributes = bEnable ?
SE_PRIVILEGE_ENABLED : 0;
@@ -1785,13 +1785,14 @@ mch_inchar(
#endif
{
int n = 1;
int conv = FALSE;
/* A key may have one or two bytes. */
typeahead[typeaheadlen] = c;
if (ch2 != NUL)
{
typeahead[typeaheadlen + 1] = ch2;
++n;
typeahead[typeaheadlen + 1] = 3;
typeahead[typeaheadlen + 2] = ch2;
n += 2;
}
#ifdef FEAT_MBYTE
/* Only convert normal characters, not special keys. Need to
@@ -1800,6 +1801,7 @@ mch_inchar(
if (input_conv.vc_type != CONV_NONE
&& (ch2 == NUL || c != K_NUL))
{
conv = TRUE;
typeaheadlen -= unconverted;
n = convert_input_safe(typeahead + typeaheadlen,
n + unconverted, TYPEAHEADLEN - typeaheadlen,
@@ -1807,6 +1809,24 @@ mch_inchar(
}
#endif
if (conv)
{
char_u *p = typeahead + typeaheadlen;
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;
}
}
/* Use the ALT key to set the 8th bit of the character
* when it's one byte, the 8th bit isn't set yet and not
* using a double-byte encoding (would become a lead