mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 08:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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.
d4c4bfa007
This commit is contained in:
Matěj Cepl
2021-10-17 16:24:34 +02:00
parent 36ff5976b9
commit b092171e7c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/buffer.c
View File

@@ -1967,7 +1967,7 @@ void free_buf_options(buf_T *buf, int free_p_ff)
clear_string_option(&buf->b_p_cpt); clear_string_option(&buf->b_p_cpt);
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);
clear_string_option(&buf->b_p_gp); clear_string_option(&buf->b_p_gp);
clear_string_option(&buf->b_p_mp); clear_string_option(&buf->b_p_mp);
clear_string_option(&buf->b_p_efm); clear_string_option(&buf->b_p_efm);

2
src/nvim/buffer_defs.h
View File

@@ -698,7 +698,7 @@ struct file_buffer {
#endif #endif
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'
char_u *b_p_tfu; ///< 'tagfunc' char_u *b_p_tfu; ///< 'tagfunc'
int b_p_eol; ///< 'endofline' int b_p_eol; ///< 'endofline'
int b_p_fixeol; ///< 'fixendofline' int b_p_fixeol; ///< 'fixendofline'

8
src/nvim/edit.c
View File

@@ -2071,7 +2071,7 @@ static bool check_compl_option(bool dict_opt)
{ {
if (dict_opt if (dict_opt
? (*curbuf->b_p_dict == NUL && *p_dict == NUL && !curwin->w_p_spell) ? (*curbuf->b_p_dict == NUL && *p_dict == NUL && !curwin->w_p_spell)
: (*curbuf->b_p_tsr == NUL && *p_tsr == NUL && *curbuf->b_p_thsfu == NUL)) { : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL && *curbuf->b_p_tsrfu == NUL)) {
ctrl_x_mode = CTRL_X_NORMAL; ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL; edit_submode = NULL;
msg_attr((dict_opt msg_attr((dict_opt
@@ -3932,7 +3932,7 @@ static char_u *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 *)"";
} }
@@ -4117,8 +4117,8 @@ int ins_compl_add_tv(typval_T *const tv, const Direction dir, bool fast)
static int thesaurus_func_complete(int type) static int thesaurus_func_complete(int type)
{ {
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);
} }
// Get the next expansion(s), using "compl_pattern". // Get the next expansion(s), using "compl_pattern".

2
src/nvim/option.c
View File

@@ -5916,7 +5916,7 @@ static char_u *get_varp(vimoption_T *p)
return (char_u *)&(curbuf->b_p_sw); return (char_u *)&(curbuf->b_p_sw);
case PV_TFU: case PV_TFU:
return (char_u *)&(curbuf->b_p_tfu); return (char_u *)&(curbuf->b_p_tfu);
case PV_THSFU: case PV_TSRFU:
return (char_u *)&(curbuf->b_p_thsfu); return (char_u *)&(curbuf->b_p_thsfu);
case PV_TS: case PV_TS:
return (char_u *)&(curbuf->b_p_ts); return (char_u *)&(curbuf->b_p_ts);