patch 9.0.0963: function name does not match autocmd event name

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

diff --git a/src/option.c b/src/option.c
index b76cbb0e11382fbececa9120f99d2d57df687db7..816837d0af75f8928d9e1eb6703540bf4638fba3 100644 (file)
--- 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 084b4387039435d21e1f83a6279aa1b2748a571d..53d3a1ac56b8d9a85cf12225d774b3aa656b04ca 100644 (file)
--- 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 0d452c26183e79c9fbb5d8cc2884594917dbba17..1fa6c562c7ad13fcdcc2f5692301db38ca2415ef 100644 (file)
--- 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 bcaef5da175c2bbb06c72b6da25ec7f8c4979959..e82e64757d5414353fbd2d0bfde07bbb8d04cd74 100644 (file)
--- 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 c71f981b9a378b0eddda4fc43cb3b1592b80eee1..b51c90480013de1e42e8f4e10fced5cf0c29bf68 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    963,
 /**/
     962,
 /**/