summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-14 09:01:38 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-14 09:01:38 +0000
commit6206877c511c636cbeb2a2b911451af316b62d00 (patch)
tree833e2ffe7891be0d15611497aa72eef44015b36d
parent829c8e87e2d99b9d87c9c745e74750177c0298df (diff)
patch 8.2.3804: script context not set when copying 'swf' and 'ts'v8.2.3804
Problem: Script context not set when copying 'swf' and 'ts'. Solution: Use COPY_OPT_SCTX with the right argument. (closes #9347)
-rw-r--r--src/option.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index bfe8f57b52..739b29adfa 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5925,7 +5925,7 @@ buf_copy_options(buf_T *buf, int flags)
else
{
buf->b_p_swf = p_swf;
- COPY_OPT_SCTX(buf, BV_INF);
+ COPY_OPT_SCTX(buf, BV_SWF);
}
buf->b_p_cpt = vim_strsave(p_cpt);
COPY_OPT_SCTX(buf, BV_CPT);
@@ -6127,6 +6127,7 @@ buf_copy_options(buf_T *buf, int flags)
COPY_OPT_SCTX(buf, BV_ISK);
did_isk = TRUE;
buf->b_p_ts = p_ts;
+ COPY_OPT_SCTX(buf, BV_TS);
#ifdef FEAT_VARTABS
buf->b_p_vts = vim_strsave(p_vts);
COPY_OPT_SCTX(buf, BV_VTS);
diff --git a/src/version.c b/src/version.c
index 7af95778c3..df439e03c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3804,
+/**/
3803,
/**/
3802,