To: vim_dev@googlegroups.com Subject: Patch 9.0.0963 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0963 Problem: Function name does not match autocmd event name. Solution: Rename "optionsset" to "optionset". (closes #11630) Files: src/option.c, src/optionstr.c, src/proto/optionstr.pro, src/testdir/test_quickfix.vim *** ../vim-9.0.0962/src/option.c 2022-11-22 18:18:26.189691616 +0000 --- src/option.c 2022-11-28 11:33:10.747890625 +0000 *************** *** 1618,1624 **** #if defined(FEAT_EVAL) if (*errmsg == NULL) ! trigger_optionsset_string(opt_idx, opt_flags, saved_origval, saved_origval_l, saved_origval_g, saved_newval); vim_free(saved_origval); vim_free(saved_origval_l); --- 1618,1624 ---- #if defined(FEAT_EVAL) if (*errmsg == NULL) ! 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); *** ../vim-9.0.0962/src/optionstr.c 2022-11-23 20:19:17.133682464 +0000 --- src/optionstr.c 2022-11-28 11:33:10.747890625 +0000 *************** *** 142,148 **** * "newval" the new value */ void ! trigger_optionsset_string( int opt_idx, int opt_flags, char_u *oldval, --- 142,148 ---- * "newval" the new value */ void ! trigger_optionset_string( int opt_idx, int opt_flags, char_u *oldval, *************** *** 542,548 **** #if defined(FEAT_EVAL) // call autocommand after handling side effects if (errmsg == NULL) ! trigger_optionsset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g, saved_newval); vim_free(saved_oldval); --- 542,548 ---- #if defined(FEAT_EVAL) // call autocommand after handling side effects if (errmsg == NULL) ! trigger_optionset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g, saved_newval); vim_free(saved_oldval); *** ../vim-9.0.0962/src/proto/optionstr.pro 2022-07-27 18:26:00.149928207 +0100 --- src/proto/optionstr.pro 2022-11-28 11:33:10.747890625 +0000 *************** *** 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 check_buf_options(buf_T *buf); void free_string_option(char_u *p); void clear_string_option(char_u **pp); --- 1,6 ---- /* optionstr.c */ void didset_string_options(void); ! 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); *** ../vim-9.0.0962/src/testdir/test_quickfix.vim 2022-10-20 16:03:29.486536722 +0100 --- src/testdir/test_quickfix.vim 2022-11-28 11:33:10.747890625 +0000 *************** *** 3394,3400 **** endfunc func Test_cclose_in_autocmd() ! " Problem is only triggered if "starting" is zero, so that the OptionsSet " event will be triggered. call test_override('starting', 1) augroup QF_Test --- 3394,3400 ---- endfunc func Test_cclose_in_autocmd() ! " Problem is only triggered if "starting" is zero, so that the OptionSet " event will be triggered. call test_override('starting', 1) augroup QF_Test *** ../vim-9.0.0962/src/version.c 2022-11-27 20:54:46.049949634 +0000 --- src/version.c 2022-11-28 11:34:43.559791103 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 963, /**/ -- "Hit any key to continue" is a lie. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///