]> granicus.if.org Git - vim/commitdiff
patch 8.2.2109: "vim -" does not work well when modifyOtherKeys is enabled v8.2.2109
authorBram Moolenaar <Bram@vim.org>
Tue, 8 Dec 2020 18:18:37 +0000 (19:18 +0100)
committerBram Moolenaar <Bram@vim.org>
Tue, 8 Dec 2020 18:18:37 +0000 (19:18 +0100)
Problem:    "vim -" does not work well when modifyOtherKeys is enabled and a
            shell command is executed on startup.
Solution:   Only change modifyOtherKeys when executing a shell command in raw
            mode.

src/os_unix.c
src/version.c

index d38cb9de4c3cb8dfe2aa4cd394498de925db80e7..1edc7e66ba671d085f0f28e61b8c33a87f4e25ab 100644 (file)
@@ -5273,8 +5273,10 @@ finished:
            {
                long delay_msec = 1;
 
-               out_str(T_CTE); // possibly disables modifyOtherKeys, so that
-                               // the system can recognize CTRL-C
+               if (tmode == TMODE_RAW)
+                   // possibly disables modifyOtherKeys, so that the system
+                   // can recognize CTRL-C
+                   out_str(T_CTE);
 
                /*
                 * Similar to the loop above, but only handle X events, no
@@ -5316,7 +5318,9 @@ finished:
                        delay_msec = 10;
                }
 
-               out_str(T_CTI); // possibly enables modifyOtherKeys again
+               if (tmode == TMODE_RAW)
+                   // possibly enables modifyOtherKeys again
+                   out_str(T_CTI);
            }
 # endif
 
index 5ac7d2e9209dd7a3b2dbe861dfd94effb1ec615e..5b4fa3951a4a8a41bcf2c73540bccf0673e27dee 100644 (file)
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2109,
 /**/
     2108,
 /**/