summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-15 15:16:40 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-15 15:16:40 +0200
commit0daf843b4cad734df6be16573423206eae43028b (patch)
treef803a569ded2a48016db910de304710fd35694fa
parent1b0675caece63c559951629837520a782d8c9cb8 (diff)
downloadvim-git-0daf843b4cad734df6be16573423206eae43028b.tar.gz
patch 8.0.0713: 'termkey' option not fully implementedv8.0.0713
Problem: 'termkey' option not fully implemented. Solution: Add initialisation.
-rw-r--r--src/option.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 82b34dc06..39aef6eda 100644
--- a/src/option.c
+++ b/src/option.c
@@ -10901,6 +10901,7 @@ copy_winopt(winopt_T *from, winopt_T *to)
to->wo_cole = from->wo_cole;
#endif
#ifdef FEAT_TERMINAL
+ to->wo_tk = vim_strsave(from->wo_tk);
to->wo_tms = vim_strsave(from->wo_tms);
#endif
#ifdef FEAT_FOLDING
@@ -10970,6 +10971,7 @@ check_winopt(winopt_T *wop UNUSED)
check_string_option(&wop->wo_cocu);
#endif
#ifdef FEAT_TERMINAL
+ check_string_option(&wop->wo_tk);
check_string_option(&wop->wo_tms);
#endif
#ifdef FEAT_LINEBREAK
@@ -11012,6 +11014,7 @@ clear_winopt(winopt_T *wop UNUSED)
clear_string_option(&wop->wo_cocu);
#endif
#ifdef FEAT_TERMINAL
+ clear_string_option(&wop->wo_tk);
clear_string_option(&wop->wo_tms);
#endif
}
diff --git a/src/version.c b/src/version.c
index 5080e2c84..3640592c1 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 */
/**/
+ 713,
+/**/
712,
/**/
711,