summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-24 20:03:01 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-24 20:03:01 +0200
commitc4f43bce7c43e5fe413e77b66b9805f3354fbb63 (patch)
tree6931f5d341f4ccb8c9ad856799ee9f75d71ec52b /src
parent81bdd6a02575b024db3dd5d91ec4ac4dfd41aa7a (diff)
patch 8.0.0766: option test fails with +terminal featurev8.0.0766
Problem: Option test fails with +terminal feature. Solution: Fix using the right option when checking the value.
Diffstat (limited to 'src')
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 987c5b5dfc..e2dfa88ec1 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7465,7 +7465,7 @@ did_set_string_option(
#ifdef FEAT_TERMINAL
/* 'termkey' */
- else if (varp == &curwin->w_p_tms)
+ else if (varp == &curwin->w_p_tk)
{
if (*curwin->w_p_tk != NUL && string_to_key(curwin->w_p_tk, TRUE) == 0)
errmsg = e_invarg;
diff --git a/src/version.c b/src/version.c
index 34017d131b..8d698c7aa5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 766,
+/**/
765,
/**/
764,