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

vim-patch:9.0.0963: function name does not match autocmd event name (#21215)

Browse Source 
Problem:    Function name does not match autocmd event name.
Solution:   Rename "optionsset" to "optionset". (closes vim/vim#11630)

269aa2b29a
This commit is contained in:
zeertzjq
2022-11-28 20:01:36 +08:00
committed by GitHub
parent a6f0444ab9
commit b2bb3973d9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/option.c
View File

@@ -1084,8 +1084,8 @@ static int do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar,
if (*errmsg == NULL) { if (*errmsg == NULL) {
if (!starting) { if (!starting) {
trigger_optionsset_string(opt_idx, opt_flags, saved_origval, saved_origval_l, trigger_optionset_string(opt_idx, opt_flags, saved_origval, saved_origval_l,
saved_origval_g, saved_newval); saved_origval_g, saved_newval);
} }
if (options[opt_idx].flags & P_UI_OPTION) { if (options[opt_idx].flags & P_UI_OPTION) {
ui_call_option_set(cstr_as_string(options[opt_idx].fullname), ui_call_option_set(cstr_as_string(options[opt_idx].fullname),

8
src/nvim/optionstr.c
View File

@@ -161,8 +161,8 @@ void didset_string_options(void)
/// "oldval_l" the old local value (only non-NULL if global and local value are set) /// "oldval_l" the old local value (only non-NULL if global and local value are set)
/// "oldval_g" the old global value (only non-NULL if global and local value are set) /// "oldval_g" the old global value (only non-NULL if global and local value are set)
/// "newval" the new value /// "newval" the new value
void trigger_optionsset_string(int opt_idx, int opt_flags, char *oldval, char *oldval_l, void trigger_optionset_string(int opt_idx, int opt_flags, char *oldval, char *oldval_l,
char *oldval_g, char *newval) char *oldval_g, char *newval)
{ {
// Don't do this recursively. // Don't do this recursively.
if (oldval != NULL if (oldval != NULL
@@ -448,8 +448,8 @@ char *set_string_option(const int opt_idx, const char *const value, const int op
// call autocommand after handling side effects // call autocommand after handling side effects
if (errmsg == NULL) { if (errmsg == NULL) {
if (!starting) { if (!starting) {
trigger_optionsset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g, trigger_optionset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g,
saved_newval); saved_newval);
} }
if (opt->flags & P_UI_OPTION) { if (opt->flags & P_UI_OPTION) {
ui_call_option_set(cstr_as_string(opt->fullname), ui_call_option_set(cstr_as_string(opt->fullname),

2
src/nvim/testdir/test_quickfix.vim
View File

@@ -3237,7 +3237,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