diff options
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/optionstr.c | 4 | ||||
| -rw-r--r-- | src/proto/optionstr.pro | 2 | ||||
| -rw-r--r-- | src/testdir/test_quickfix.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c index b76cbb0e1..816837d0a 100644 --- a/src/option.c +++ b/src/option.c @@ -1618,7 +1618,7 @@ do_set_string( #if defined(FEAT_EVAL) 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); vim_free(saved_origval); vim_free(saved_origval_l); diff --git a/src/optionstr.c b/src/optionstr.c index 084b43870..53d3a1ac5 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -142,7 +142,7 @@ didset_string_options(void) * "newval" the new value */ void -trigger_optionsset_string( +trigger_optionset_string( int opt_idx, int opt_flags, char_u *oldval, @@ -542,7 +542,7 @@ set_string_option( #if defined(FEAT_EVAL) // call autocommand after handling side effects if (errmsg == NULL) - trigger_optionsset_string(opt_idx, opt_flags, + trigger_optionset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g, saved_newval); vim_free(saved_oldval); diff --git a/src/proto/optionstr.pro b/src/proto/optionstr.pro index 0d452c261..1fa6c562c 100644 --- a/src/proto/optionstr.pro +++ b/src/proto/optionstr.pro @@ -1,6 +1,6 @@ /* optionstr.c */ 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 free_string_option(char_u *p); void clear_string_option(char_u **pp); diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index bcaef5da1..e82e64757 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -3394,7 +3394,7 @@ func Test_cclose_from_copen() endfunc 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. call test_override('starting', 1) augroup QF_Test diff --git a/src/version.c b/src/version.c index c71f981b9..b51c90480 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 963, +/**/ 962, /**/ 961, |