aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

updated for version 7.3.946

Browse Source 
Problem:    Sometimes get stuck in waiting for cursor position report,
            resulting in keys starting with <Esc>[ not working.
Solution:   Only wait for more characters after <Esc>[ if followed by '?', '>'
            or a digit.
This commit is contained in:
Bram Moolenaar
2013-05-15 14:22:41 +02:00
parent dfa38d4e45
commit 46a7561f3a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/term.c
View File

@@ -4126,9 +4126,11 @@ check_termcode(max_offset, buf, bufsize, buflen)
* The final byte is 'R'. now it is only used for checking for * The final byte is 'R'. now it is only used for checking for
* ambiguous-width character state. * ambiguous-width character state.
*/ */
p = tp[0] == CSI ? tp + 1 : tp + 2;
if ((*T_CRV != NUL || *T_U7 != NUL) if ((*T_CRV != NUL || *T_U7 != NUL)
&& ((tp[0] == ESC && tp[1] == '[' && len >= 3) && ((tp[0] == ESC && tp[1] == '[' && len >= 3)
|| (tp[0] == CSI && len >= 2))) || (tp[0] == CSI && len >= 2))
&& (VIM_ISDIGIT(*p) || *p == '>' || *p == '?'))
{ {
j = 0; j = 0;
extra = 0; extra = 0;
@@ -4136,7 +4138,7 @@ check_termcode(max_offset, buf, bufsize, buflen)
&& !(tp[i] >= '{' && tp[i] <= '~') && !(tp[i] >= '{' && tp[i] <= '~')
&& !ASCII_ISALPHA(tp[i]); ++i) && !ASCII_ISALPHA(tp[i]); ++i)
if (tp[i] == ';' && ++j == 1) if (tp[i] == ';' && ++j == 1)
extra = atoi((char *)tp + i + 1); extra = i + 1;
if (i == len) if (i == len)
return -1; /* not enough characters */ return -1; /* not enough characters */
@@ -4150,6 +4152,8 @@ check_termcode(max_offset, buf, bufsize, buflen)
# ifdef FEAT_AUTOCMD # ifdef FEAT_AUTOCMD
did_cursorhold = TRUE; did_cursorhold = TRUE;
# endif # endif
if (extra > 0)
extra = atoi((char *)tp + extra);
if (extra == 2) if (extra == 2)
aw = "single"; aw = "single";
else if (extra == 3) else if (extra == 3)
@@ -4178,6 +4182,8 @@ check_termcode(max_offset, buf, bufsize, buflen)
/* rxvt sends its version number: "20703" is 2.7.3. /* rxvt sends its version number: "20703" is 2.7.3.
* Ignore it for when the user has set 'term' to xterm, * Ignore it for when the user has set 'term' to xterm,
* even though it's an rxvt. */ * even though it's an rxvt. */
if (extra > 0)
extra = atoi((char *)tp + extra);
if (extra > 20000) if (extra > 20000)
extra = 0; extra = 0;

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
946,
/**/ /**/
945, 945,
/**/ /**/