patch 9.0.0996: if 'keyprotocol' is empty "xterm" still uses modifyOtherKeys

Problem:    If 'keyprotocol' is empty "xterm" still uses modifyOtherKeys.
Solution:   Remove t_TI, t_RK and t_TE from the "xterm" builtin termcap and
            let the default value of 'keyprotocol' add those.

diff --git a/src/term.c b/src/term.c
index 3c9a2430940fdeb070ec267ff5e8aab61c4aeb66..3df1214337552369b6e4226b1cf98c671c5aefcb 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -452,9 +452,11 @@ static tcap_entry_T builtin_xterm[] = {
     {(int)KS_TI,       "\0337\033[?47h"},
     {(int)KS_TE,       "\033[?47l\0338"},
 #  endif
-    {(int)KS_CTI,      "\033[>4;2m"},
-    {(int)KS_CRK,      "\033[?4m"},  // see "builtin_mok2"
-    {(int)KS_CTE,      "\033[>4;m"},
+    // These are now under control of the 'keyprotocol' option, see
+    // "builtin_mok2".
+    // {(int)KS_CTI,   "\033[>4;2m"},
+    // {(int)KS_CRK,   "\033[?4m"},
+    // {(int)KS_CTE,   "\033[>4;m"},
     {(int)KS_CIS,      "\033]1;"},
     {(int)KS_CIE,      "\007"},
     {(int)KS_TS,       "\033]2;"},

diff --git a/src/version.c b/src/version.c
index 444e9bfd19d1b439fd062fc13ffa07dc92f1dbd1..8ccf7d2b335c04d1aff13ff41fe437ef2e337bec 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    996,
 /**/
     995,
 /**/