aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3525: option variable name does not match option name

Browse Source 
Problem:    Option variable name does not match option name. (Christ van
            Willigen)
Solution:   Rename the variable.
This commit is contained in:
Bram Moolenaar 2021-10-16 21:14:11 +01:00
parent 4eeedc09fe
commit d4c4bfa007
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.c
View File

@ -2364,7 +2364,7 @@ free_buf_options(
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC
clear_string_option(&buf->b_p_cfu); clear_string_option(&buf->b_p_cfu);
clear_string_option(&buf->b_p_ofu); clear_string_option(&buf->b_p_ofu);
clear_string_option(&buf->b_p_thsfu); clear_string_option(&buf->b_p_tsrfu);
#endif #endif
#ifdef FEAT_QUICKFIX #ifdef FEAT_QUICKFIX
clear_string_option(&buf->b_p_gp); clear_string_option(&buf->b_p_gp);

8
src/insexpand.c
View File

@ -301,7 +301,7 @@ has_compl_option(int dict_opt)
) )
: (*curbuf->b_p_tsr == NUL && *p_tsr == NUL : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC
&& *curbuf->b_p_thsfu == NUL && *curbuf->b_p_tsrfu == NUL
#endif #endif
)) ))
{ {
@ -2246,7 +2246,7 @@ get_complete_funcname(int type)
case CTRL_X_OMNI: case CTRL_X_OMNI:
return curbuf->b_p_ofu; return curbuf->b_p_ofu;
case CTRL_X_THESAURUS: case CTRL_X_THESAURUS:
return curbuf->b_p_thsfu; return curbuf->b_p_tsrfu;
default: default:
return (char_u *)""; return (char_u *)"";
} }
@ -2751,8 +2751,8 @@ thesaurus_func_complete(int type UNUSED)
{ {
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC
return (type == CTRL_X_THESAURUS return (type == CTRL_X_THESAURUS
&& curbuf->b_p_thsfu != NULL && curbuf->b_p_tsrfu != NULL
&& *curbuf->b_p_thsfu != NUL); && *curbuf->b_p_tsrfu != NUL);
#else #else
return FALSE; return FALSE;
#endif #endif

4
src/option.c
View File

@ -5433,7 +5433,7 @@ get_varp(struct vimoption *p)
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC
case PV_CFU: return (char_u *)&(curbuf->b_p_cfu); case PV_CFU: return (char_u *)&(curbuf->b_p_cfu);
case PV_OFU: return (char_u *)&(curbuf->b_p_ofu); 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 #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
case PV_TFU: return (char_u *)&(curbuf->b_p_tfu); 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); COPY_OPT_SCTX(buf, BV_CFU);
buf->b_p_ofu = vim_strsave(p_ofu); buf->b_p_ofu = vim_strsave(p_ofu);
COPY_OPT_SCTX(buf, BV_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); COPY_OPT_SCTX(buf, BV_THSFU);
#endif #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL

2
src/optionstr.c
View File

@ -271,7 +271,7 @@ check_buf_options(buf_T *buf)
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC
check_string_option(&buf->b_p_cfu); check_string_option(&buf->b_p_cfu);
check_string_option(&buf->b_p_ofu); check_string_option(&buf->b_p_ofu);
check_string_option(&buf->b_p_thsfu); check_string_option(&buf->b_p_tsrfu);
#endif #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
check_string_option(&buf->b_p_tfu); check_string_option(&buf->b_p_tfu);

2
src/structs.h
View File

@ -2864,7 +2864,7 @@ struct file_buffer
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC
char_u *b_p_cfu; // 'completefunc' char_u *b_p_cfu; // 'completefunc'
char_u *b_p_ofu; // 'omnifunc' char_u *b_p_ofu; // 'omnifunc'
char_u *b_p_thsfu; // 'thesaurusfunc' char_u *b_p_tsrfu; // 'thesaurusfunc'
#endif #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
char_u *b_p_tfu; // 'tagfunc' char_u *b_p_tfu; // 'tagfunc'

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3525,
/**/ /**/
3524, 3524,
/**/ /**/