diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-15 14:04:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-15 14:04:01 +0200 |
| commit | 1b0675caece63c559951629837520a782d8c9cb8 (patch) | |
| tree | 8fa5978e133b045e086fb7fadb3d5533416abd3c | |
| parent | 74675a666b51edd61e0210132658d81a86c5102c (diff) | |
| download | vim-git-1b0675caece63c559951629837520a782d8c9cb8.tar.gz | |
patch 8.0.0712: the terminal implementation is incompletev8.0.0712
Problem: The terminal implementation is incomplete.
Solution: Add the 'termkey' option.
| -rw-r--r-- | src/option.c | 11 | ||||
| -rw-r--r-- | src/option.h | 1 | ||||
| -rw-r--r-- | src/structs.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index cdb0d67e6..82b34dc06 100644 --- 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 @@ -2781,6 +2782,15 @@ static struct vimoption options[] = {(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, #ifdef FEAT_TERMINAL (char_u *)VAR_WIN, PV_TMS, @@ -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 69fc348ac..c74a89b22 100644 --- 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 c3f120008..88e71b60e 100644 --- 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 6d448ae24..5080e2c84 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 712, +/**/ 711, /**/ 710, |