patch 9.0.0385: GUI: when CTRL-D is mapped in Insert mode it gets inserted

Problem:    GUI: when CTRL-D is mapped in Insert mode it gets inserted.
            (Yasuhiro Matsumoto)
Solution:   Also recognize modifier starting with CSI. (closes #11057)

diff --git a/src/getchar.c b/src/getchar.c
index fee9191ba03c5b7511f7a3269f628ef972afa102..51faa2382cf69a1ce58dbad246d0cbcc621bb6eb 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2356,7 +2356,7 @@ check_simplify_modifier(int max_offset)
        if (offset + 3 >= typebuf.tb_len)
            break;
        tp = typebuf.tb_buf + typebuf.tb_off + offset;
-       if (tp[0] == K_SPECIAL && tp[1] == KS_MODIFIER)
+       if ((tp[0] == K_SPECIAL || tp[0] == CSI) && tp[1] == KS_MODIFIER)
        {
            // A modifier was not used for a mapping, apply it to ASCII keys.
            // Shift would already have been applied.

diff --git a/src/version.c b/src/version.c
index 181417f14cc1b0e7097aecb3ac747b6b133752c4..3df00f899fb043d0dcd7906b6a1da3298ecba800 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    385,
 /**/
     384,
 /**/