diff --git a/src/option.c b/src/option.c
index b76cbb0..816837d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1618,7 +1618,7 @@
 
 #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 084b438..53d3a1a 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -142,7 +142,7 @@
  * "newval"	the new value
  */
     void
-trigger_optionsset_string(
+trigger_optionset_string(
 	int	opt_idx,
 	int	opt_flags,
 	char_u  *oldval,
@@ -542,7 +542,7 @@
 #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 0d452c2..1fa6c56 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 bcaef5d..e82e647 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -3394,7 +3394,7 @@
 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 c71f981..b51c904 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    963,
+/**/
     962,
 /**/
     961,