Mercurial > vim
changeset 25984:c8fcea636252 v8.2.3525
patch 8.2.3525: option variable name does not match option name
Commit: https://github.com/vim/vim/commit/d4c4bfa0078a959ff90ef30288fd31d9d38f23d7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 16 21:14:11 2021 +0100
patch 8.2.3525: option variable name does not match option name
Problem: Option variable name does not match option name. (Christ van
Willigen)
Solution: Rename the variable.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 16 Oct 2021 22:15:04 +0200 |
| parents | e9547957500d |
| children | 4cfcfd90ccdb |
| files | src/buffer.c src/insexpand.c src/option.c src/optionstr.c src/structs.h src/version.c |
| diffstat | 6 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -2364,7 +2364,7 @@ free_buf_options( #ifdef FEAT_COMPL_FUNC clear_string_option(&buf->b_p_cfu); clear_string_option(&buf->b_p_ofu); - clear_string_option(&buf->b_p_thsfu); + clear_string_option(&buf->b_p_tsrfu); #endif #ifdef FEAT_QUICKFIX clear_string_option(&buf->b_p_gp);
--- a/src/insexpand.c +++ b/src/insexpand.c @@ -301,7 +301,7 @@ has_compl_option(int dict_opt) ) : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL #ifdef FEAT_COMPL_FUNC - && *curbuf->b_p_thsfu == NUL + && *curbuf->b_p_tsrfu == NUL #endif )) { @@ -2246,7 +2246,7 @@ get_complete_funcname(int type) case CTRL_X_OMNI: return curbuf->b_p_ofu; case CTRL_X_THESAURUS: - return curbuf->b_p_thsfu; + return curbuf->b_p_tsrfu; default: return (char_u *)""; } @@ -2751,8 +2751,8 @@ thesaurus_func_complete(int type UNUSED) { #ifdef FEAT_COMPL_FUNC return (type == CTRL_X_THESAURUS - && curbuf->b_p_thsfu != NULL - && *curbuf->b_p_thsfu != NUL); + && curbuf->b_p_tsrfu != NULL + && *curbuf->b_p_tsrfu != NUL); #else return FALSE; #endif
--- a/src/option.c +++ b/src/option.c @@ -5433,7 +5433,7 @@ 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_thsfu); + 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,7 +5936,7 @@ 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_thsfu = vim_strsave(p_thsfu); + buf->b_p_tsrfu = vim_strsave(p_thsfu); COPY_OPT_SCTX(buf, BV_THSFU); #endif #ifdef FEAT_EVAL
--- a/src/optionstr.c +++ b/src/optionstr.c @@ -271,7 +271,7 @@ check_buf_options(buf_T *buf) #ifdef FEAT_COMPL_FUNC check_string_option(&buf->b_p_cfu); check_string_option(&buf->b_p_ofu); - check_string_option(&buf->b_p_thsfu); + check_string_option(&buf->b_p_tsrfu); #endif #ifdef FEAT_EVAL check_string_option(&buf->b_p_tfu);
--- a/src/structs.h +++ b/src/structs.h @@ -2864,7 +2864,7 @@ struct file_buffer #ifdef FEAT_COMPL_FUNC char_u *b_p_cfu; // 'completefunc' char_u *b_p_ofu; // 'omnifunc' - char_u *b_p_thsfu; // 'thesaurusfunc' + char_u *b_p_tsrfu; // 'thesaurusfunc' #endif #ifdef FEAT_EVAL char_u *b_p_tfu; // 'tagfunc'