summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-19 21:57:11 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-19 21:57:11 +0200
commit386b43e59498cc7b52a60f09f74bdb44df99386c (patch)
treeb03e6a4ff3064cad060088af49538dcf9697c01e
parent999dc14644b8a9530ce0da22e90ca402c95c9c5a (diff)
patch 8.1.1358: cannot enter character with a CSI bytev8.1.1358
Problem: Cannot enter character with a CSI byte. Solution: Only check "gui.in_use" when VIMDLL is defined. (Ken Takata, closes #4396)
-rw-r--r--src/getchar.c12
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 4 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 6a4c60f067..9379a6a8d4 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1453,9 +1453,9 @@ openscript(
oldcurscript = curscript;
do
{
- update_topline_cursor(); /* update cursor position and topline */
- normal_cmd(&oa, FALSE); /* execute one command */
- vpeekc(); /* check for end of file */
+ update_topline_cursor(); // update cursor position and topline
+ normal_cmd(&oa, FALSE); // execute one command
+ vpeekc(); // check for end of file
}
while (scriptin[oldcurscript] != NULL);
@@ -1753,7 +1753,11 @@ vgetc(void)
buf[i] = vgetorpeek(TRUE);
if (buf[i] == K_SPECIAL
#ifdef FEAT_GUI
- || (gui.in_use && buf[i] == CSI)
+ || (
+# ifdef VIMDLL
+ gui.in_use &&
+# endif
+ buf[i] == CSI)
#endif
)
{
diff --git a/src/version.c b/src/version.c
index edc72ecfc3..0cd0d7caf3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1358,
+/**/
1357,
/**/
1356,