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 9.0.0963: function name does not match autocmd event name

Browse Source 
Problem:    Function name does not match autocmd event name.
Solution:   Rename "optionsset" to "optionset". (closes #11630)
This commit is contained in:
zeertzjq 2022-11-28 11:36:50 +00:00 committed by Bram Moolenaar
parent 38854b565a
commit 269aa2b29a
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/option.c
View File

@ -1618,7 +1618,7 @@ do_set_string(
#if defined(FEAT_EVAL) #if defined(FEAT_EVAL)
if (*errmsg == NULL) if (*errmsg == NULL)
trigger_optionsset_string(opt_idx, opt_flags, saved_origval, trigger_optionset_string(opt_idx, opt_flags, saved_origval,
saved_origval_l, saved_origval_g, saved_newval); saved_origval_l, saved_origval_g, saved_newval);
vim_free(saved_origval); vim_free(saved_origval);
vim_free(saved_origval_l); vim_free(saved_origval_l);

4
src/optionstr.c
View File

@ -142,7 +142,7 @@ didset_string_options(void)
* "newval" the new value * "newval" the new value
*/ */
void void
trigger_optionsset_string( trigger_optionset_string(
int opt_idx, int opt_idx,
int opt_flags, int opt_flags,
char_u *oldval, char_u *oldval,
@ -542,7 +542,7 @@ set_string_option(
#if defined(FEAT_EVAL) #if defined(FEAT_EVAL)
// call autocommand after handling side effects // call autocommand after handling side effects
if (errmsg == NULL) if (errmsg == NULL)
trigger_optionsset_string(opt_idx, opt_flags, trigger_optionset_string(opt_idx, opt_flags,
saved_oldval, saved_oldval_l, saved_oldval, saved_oldval_l,
saved_oldval_g, saved_newval); saved_oldval_g, saved_newval);
vim_free(saved_oldval); vim_free(saved_oldval);

2
src/proto/optionstr.pro
View File

@ -1,6 +1,6 @@
/* optionstr.c */ /* optionstr.c */
void didset_string_options(void); void didset_string_options(void);
void trigger_optionsset_string(int opt_idx, int opt_flags, char_u *oldval, char_u *oldval_l, char_u *oldval_g, char_u *newval); void trigger_optionset_string(int opt_idx, int opt_flags, char_u *oldval, char_u *oldval_l, char_u *oldval_g, char_u *newval);
void check_buf_options(buf_T *buf); void check_buf_options(buf_T *buf);
void free_string_option(char_u *p); void free_string_option(char_u *p);
void clear_string_option(char_u **pp); void clear_string_option(char_u **pp);

2
src/testdir/test_quickfix.vim
View File

@ -3394,7 +3394,7 @@ func Test_cclose_from_copen()
endfunc endfunc
func Test_cclose_in_autocmd() func Test_cclose_in_autocmd()
" Problem is only triggered if "starting" is zero, so that the OptionsSet " Problem is only triggered if "starting" is zero, so that the OptionSet
" event will be triggered. " event will be triggered.
call test_override('starting', 1) call test_override('starting', 1)
augroup QF_Test augroup QF_Test

2
src/version.c
View File

@ -695,6 +695,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 */
/**/
963,
/**/ /**/
962, 962,
/**/ /**/