diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-10-17 14:13:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-17 14:13:09 +0100 |
| commit | f4d8b76d304dabc39c06d2344cd4c7b28484811b (patch) | |
| tree | 56f98aadab44534d6529e802c00bbff8adbf0969 /src/option.c | |
| parent | 9d4b8caf9eddb2db09395587c621309f4513befa (diff) | |
patch 8.2.3528: 'thesaurus' and 'thesaurusfunc' do not have the same scopev8.2.3528
Problem: 'thesaurus' and 'thesaurusfunc' do not have the same scope.
Solution: Make 'thesaurusfunc' global-local.
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c index 7d86ccf14d..e8afa7c254 100644 --- a/src/option.c +++ b/src/option.c @@ -5131,6 +5131,11 @@ unset_global_local_option(char_u *name, void *from) case PV_TSR: clear_string_option(&buf->b_p_tsr); break; +#ifdef FEAT_COMPL_FUNC + case PV_TSRFU: + clear_string_option(&buf->b_p_tsrfu); + break; +#endif case PV_FP: clear_string_option(&buf->b_p_fp); break; @@ -5225,6 +5230,9 @@ get_varp_scope(struct vimoption *p, int opt_flags) #endif case PV_DICT: return (char_u *)&(curbuf->b_p_dict); case PV_TSR: return (char_u *)&(curbuf->b_p_tsr); +#ifdef FEAT_COMPL_FUNC + case PV_TSRFU: return (char_u *)&(curbuf->b_p_tsrfu); +#endif #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) case PV_BEXPR: return (char_u *)&(curbuf->b_p_bexpr); #endif @@ -5305,6 +5313,10 @@ get_varp(struct vimoption *p) ? (char_u *)&(curbuf->b_p_dict) : p->var; case PV_TSR: return *curbuf->b_p_tsr != NUL ? (char_u *)&(curbuf->b_p_tsr) : p->var; +#ifdef FEAT_COMPL_FUNC + case PV_TSRFU: return *curbuf->b_p_tsrfu != NUL + ? (char_u *)&(curbuf->b_p_tsrfu) : p->var; +#endif case PV_FP: return *curbuf->b_p_fp != NUL ? (char_u *)&(curbuf->b_p_fp) : p->var; #ifdef FEAT_QUICKFIX @@ -5433,7 +5445,6 @@ get_varp(struct vimoption *p) #ifdef FEAT_COMPL_FUNC case PV_CFU: return (char_u *)&(curbuf->b_p_cfu); case PV_OFU: return (char_u *)&(curbuf->b_p_ofu); - case PV_THSFU: return (char_u *)&(curbuf->b_p_tsrfu); #endif #ifdef FEAT_EVAL case PV_TFU: return (char_u *)&(curbuf->b_p_tfu); @@ -5936,8 +5947,6 @@ buf_copy_options(buf_T *buf, int flags) COPY_OPT_SCTX(buf, BV_CFU); buf->b_p_ofu = vim_strsave(p_ofu); COPY_OPT_SCTX(buf, BV_OFU); - buf->b_p_tsrfu = vim_strsave(p_thsfu); - COPY_OPT_SCTX(buf, BV_THSFU); #endif #ifdef FEAT_EVAL buf->b_p_tfu = vim_strsave(p_tfu); @@ -6080,6 +6089,9 @@ buf_copy_options(buf_T *buf, int flags) #endif buf->b_p_dict = empty_option; buf->b_p_tsr = empty_option; +#ifdef FEAT_COMPL_FUNC + buf->b_p_tsrfu = empty_option; +#endif #ifdef FEAT_TEXTOBJ buf->b_p_qe = vim_strsave(p_qe); COPY_OPT_SCTX(buf, BV_QE); |