patch 8.2.3804: script context not set when copying 'swf' and 'ts'

Problem:    Script context not set when copying 'swf' and 'ts'.
Solution:   Use COPY_OPT_SCTX with the right argument. (closes #9347)

diff --git a/src/option.c b/src/option.c
index bfe8f57b5212f27da93150ccd93ec6da9a23f6c7..739b29adfaa4aa1a3ba753d920699c0bbc02fc42 100644 (file)
--- 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 7af95778c3c45c707f88925dee0ff38efadad05c..df439e03c21edde7788f3f525973b345146db9c1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3804,
 /**/
     3803,
 /**/