patch 8.0.0712: the terminal implementation is incomplete

Problem:    The terminal implementation is incomplete.
Solution:   Add the 'termkey' option.

diff --git a/src/option.c b/src/option.c
index cdb0d67e6afc355c9a877f3026394dbda260bd52..82b34dc06c4be05bedb9c000be75e46eef24978f 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -258,6 +258,7 @@
 # define PV_COLE       OPT_WIN(WV_COLE)
 #endif
 #ifdef FEAT_TERMINAL
+# define PV_TK         OPT_WIN(WV_TK)
 # define PV_TMS                OPT_WIN(WV_TMS)
 #endif
 #ifdef FEAT_SIGNS
@@ -2779,6 +2780,15 @@ static struct vimoption options[] =
 #else
                            (char_u*)NULL, PV_NONE,
                            {(char_u *)FALSE, (char_u *)FALSE}
+#endif
+                           SCRIPTID_INIT},
+    {"termkey", "tk",      P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF,
+#ifdef FEAT_TERMINAL
+                           (char_u *)VAR_WIN, PV_TK,
+                           {(char_u *)"\x17", (char_u *)NULL}
+#else
+                           (char_u *)NULL, PV_NONE,
+                           {(char_u *)NULL, (char_u *)0L}
 #endif
                            SCRIPTID_INIT},
     {"termsize", "tms",            P_STRING|P_ALLOCED|P_RWIN|P_VI_DEF,
@@ -10681,6 +10691,7 @@ get_varp(struct vimoption *p)
        case PV_COLE:   return (char_u *)&(curwin->w_p_cole);
 #endif
 #ifdef FEAT_TERMINAL
+       case PV_TK:     return (char_u *)&(curwin->w_p_tk);
        case PV_TMS:    return (char_u *)&(curwin->w_p_tms);
 #endif
 

diff --git a/src/option.h b/src/option.h
index 69fc348aca9cf37e851729a0cdc2ef638245916c..c74a89b22e923c1c94d6d03f0aa9c17e29ed886e 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -1131,6 +1131,7 @@ enum
     , WV_COLE
 #endif
 #ifdef FEAT_TERMINAL
+    , WV_TK
     , WV_TMS
 #endif
 #ifdef FEAT_CURSORBIND

diff --git a/src/structs.h b/src/structs.h
index c3f120008c131fc03f2eace090c8fb6f07b7dc5d..88e71b60e9827a6ec7f8497491532e123b1a0b12 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -270,6 +270,8 @@ typedef struct
 # define w_p_scl w_onebuf_opt.wo_scl   /* 'signcolumn' */
 #endif
 #ifdef FEAT_TERMINAL
+    char_u     *wo_tk;
+#define w_p_tk w_onebuf_opt.wo_tk      /* 'termkey' */
     char_u     *wo_tms;
 #define w_p_tms w_onebuf_opt.wo_tms    /* 'termsize' */
 #endif

diff --git a/src/version.c b/src/version.c
index 6d448ae240204326338725393e0742347bba99ce..5080e2c84c2c0eb2bb66ea745e4af0ef77c6b951 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    712,
 /**/
     711,
 /**/