patch 8.1.1358: cannot enter character with a CSI byte

Problem:    Cannot enter character with a CSI byte.
Solution:   Only check "gui.in_use" when VIMDLL is defined. (Ken Takata,
            closes #4396)

diff --git a/src/getchar.c b/src/getchar.c
index 6a4c60f0676398f53b5c0fcc222694d0e262e509..9379a6a8d4530e456f5978045127eba77b6734ca 100644 (file)
--- 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 edc72ecfc3fdcfea83f3985b423f0382620b16a6..0cd0d7caf39dc5fc57703cc4f08cefb69a4bcdec 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1358,
 /**/
     1357,
 /**/