updated for version 7.4.306
Problem: getchar(0) does not return Esc.
Solution: Do not wait for an Esc sequence to be complete. (Yasuhiro
Matsumoto)
diff --git a/src/eval.c b/src/eval.c
index bc7f22a..3d3c8b4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11313,13 +11313,14 @@
n = safe_vgetc();
else if (get_tv_number_chk(&argvars[0], &error) == 1)
/* getchar(1): only check if char avail */
- n = vpeekc();
- else if (error || vpeekc() == NUL)
+ n = vpeekc_any();
+ else if (error || vpeekc_any() == NUL)
/* illegal argument or getchar(0) and no char avail: return zero */
n = 0;
else
/* getchar(0) and char avail: return char */
n = safe_vgetc();
+
if (n == K_IGNORE)
continue;
break;
diff --git a/src/getchar.c b/src/getchar.c
index b39e64d..c4ffb4b 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1883,7 +1883,7 @@
}
#endif
-#if defined(FEAT_INS_EXPAND) || defined(PROTO)
+#if defined(FEAT_INS_EXPAND) || defined(FEAT_EVAL) || defined(PROTO)
/*
* Check if any character is available, also half an escape sequence.
* Trick: when no typeahead found, but there is something in the typeahead
diff --git a/src/version.c b/src/version.c
index fcf4127..de58cbd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 306,
+/**/
305,
/**/
304,