patch 9.1.1631: proto files are outdated Commit: https://github.com/vim/vim/commit/bb07b1ac14c4014acebd27dd011802ea4755308a Author: Yegappan Lakshmanan <yegap...@yahoo.com> Date: Thu Aug 14 21:00:51 2025 +0200
patch 9.1.1631: proto files are outdated Problem: proto files are outdated Solution: Regenerate proto files (Yegappan Lakshmanan) closes: #17997 Signed-off-by: Yegappan Lakshmanan <yegap...@yahoo.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/proto/cmdexpand.pro b/src/proto/cmdexpand.pro index 1ace23c5c..388b80b13 100644 --- a/src/proto/cmdexpand.pro +++ b/src/proto/cmdexpand.pro @@ -3,7 +3,7 @@ int cmdline_fuzzy_complete(char_u *fuzzystr); int nextwild(expand_T *xp, int type, int options, int escape); void cmdline_pum_display(void); int cmdline_pum_active(void); -void cmdline_pum_remove(cmdline_info_T *cclp, int defer); +void cmdline_pum_remove(cmdline_info_T *cclp, int defer_redraw); void cmdline_pum_cleanup(cmdline_info_T *cclp); int cmdline_compl_startcol(void); char_u *cmdline_compl_pattern(void); @@ -25,5 +25,5 @@ int wildmenu_process_key(cmdline_info_T *cclp, int key, expand_T *xp); void wildmenu_cleanup(cmdline_info_T *cclp); void f_getcompletion(typval_T *argvars, typval_T *rettv); void f_getcompletiontype(typval_T *argvars, typval_T *rettv); -void f_cmdcomplete_info(typval_T *argvars UNUSED, typval_T *rettv); +void f_cmdcomplete_info(typval_T *argvars, typval_T *rettv); /* vim: set ft=c : */ diff --git a/src/proto/diff.pro b/src/proto/diff.pro index b5c59e4a7..e87e81b8c 100644 --- a/src/proto/diff.pro +++ b/src/proto/diff.pro @@ -16,15 +16,15 @@ void diff_clear(tabpage_T *tp); int diff_check_with_linestatus(win_T *wp, linenr_T lnum, int *linestatus); int diff_check_fill(win_T *wp, linenr_T lnum); void diff_set_topline(win_T *fromwin, win_T *towin); -int diffanchors_changed(int local); +int diffanchors_changed(int buflocal); int diffopt_changed(void); int diffopt_horizontal(void); int diffopt_hiddenoff(void); int diffopt_closeoff(void); void diff_update_line(linenr_T lnum); #ifdef FEAT_DIFF -int diff_change_parse( diffline_T *diffline, diffline_change_T *change, int *change_start, int *change_end); -int diff_find_change( win_T *wp, linenr_T lnum, diffline_T *diffline); +int diff_change_parse(diffline_T *diffline, diffline_change_T *change, int *change_start, int *change_end); +int diff_find_change(win_T *wp, linenr_T lnum, diffline_T *diffline); #endif int diff_infold(win_T *wp, linenr_T lnum); void nv_diffgetput(int put, long count); diff --git a/src/proto/ex_docmd.pro b/src/proto/ex_docmd.pro index 6d2961c01..c79d5b4d7 100644 --- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -16,7 +16,6 @@ int cmdmod_error(int ignore_silent); void apply_cmdmod(cmdmod_T *cmod); void undo_cmdmod(cmdmod_T *cmod); int parse_cmd_address(exarg_T *eap, char **errormsg, int silent); -linenr_T get_address(exarg_T *eap, char_u **ptr, cmd_addr_T addr_type, int skip, int silent, int to_other_file, int address_count); char_u *skip_option_env_lead(char_u *start); int number_method(char_u *cmd); char_u *find_ex_command(exarg_T *eap, int *full, int (*lookup)(char_u *, size_t, int cmd, cctx_T *), cctx_T *cctx); @@ -26,6 +25,7 @@ void f_fullcommand(typval_T *argvars, typval_T *rettv); cmdidx_T excmd_get_cmdidx(char_u *cmd, int len); long excmd_get_argt(cmdidx_T idx); char_u *skip_range(char_u *cmd_start, int skip_star, int *ctx); +linenr_T get_address(exarg_T *eap, char_u **ptr, cmd_addr_T addr_type, int skip, int silent, int to_other_file, int address_count); void ex_ni(exarg_T *eap); int expand_filename(exarg_T *eap, char_u **cmdlinep, char **errormsgp); void separate_nextcmd(exarg_T *eap, int keep_backslash); diff --git a/src/proto/ex_getln.pro b/src/proto/ex_getln.pro index 7270469a2..d37be4bc9 100644 --- a/src/proto/ex_getln.pro +++ b/src/proto/ex_getln.pro @@ -1,4 +1,5 @@ /* ex_getln.c */ +int parse_pattern_and_range(pos_T *incsearch_start, int *search_delim, int *skiplen, int *patlen); void cmdline_init(void); char_u *getcmdline(int firstc, long count, int indent, getline_opt_T do_concat); char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg); @@ -39,12 +40,11 @@ void f_getcmdscreenpos(typval_T *argvars, typval_T *rettv); void f_getcmdtype(typval_T *argvars, typval_T *rettv); void f_setcmdline(typval_T *argvars, typval_T *rettv); void f_setcmdpos(typval_T *argvars, typval_T *rettv); -void f_wildtrigger(typval_T *argvars, typval_T *rettv); int get_cmdline_firstc(void); int get_list_range(char_u **str, int *num1, int *num2); char *did_set_cedit(optset_T *args); int is_in_cmdwin(void); char_u *script_get(exarg_T *eap, char_u *cmd); void get_user_input(typval_T *argvars, typval_T *rettv, int inputdialog, int secret); -int parse_pattern_and_range(pos_T *is_start, int *search_delim, int *skiplen, int *patlen); +void f_wildtrigger(typval_T *argvars, typval_T *rettv); /* vim: set ft=c : */ diff --git a/src/proto/insexpand.pro b/src/proto/insexpand.pro index 5b57be988..bc57e0e87 100644 --- a/src/proto/insexpand.pro +++ b/src/proto/insexpand.pro @@ -15,9 +15,9 @@ int ctrl_x_mode_function(void); int ctrl_x_mode_omni(void); int ctrl_x_mode_spell(void); int ctrl_x_mode_line_or_eval(void); +int ctrl_x_mode_register(void); int ctrl_x_mode_not_default(void); int ctrl_x_mode_not_defined_yet(void); -int ctrl_x_mode_register(void); int compl_status_adding(void); int compl_status_sol(void); int compl_status_local(void); @@ -51,27 +51,27 @@ int ins_compl_preinsert_effect(void); int ins_compl_bs(void); void ins_compl_addleader(int c); void ins_compl_addfrommatch(void); +int ins_compl_cancel(void); int ins_compl_prep(int c); char *did_set_completefunc(optset_T *args); void set_buflocal_cfu_callback(buf_T *buf); char *did_set_omnifunc(optset_T *args); void set_buflocal_ofu_callback(buf_T *buf); +void clear_cpt_callbacks(callback_T **callbacks, int count); +void set_buflocal_cpt_callbacks(buf_T *buf); +int set_cpt_callbacks(optset_T *args); char *did_set_thesaurusfunc(optset_T *args); +int set_ref_in_cpt_callbacks(callback_T *callbacks, int count, int copyID); int set_ref_in_insexpand_funcs(int copyID); void f_complete(typval_T *argvars, typval_T *rettv); void f_complete_add(typval_T *argvars, typval_T *rettv); void f_complete_check(typval_T *argvars, typval_T *rettv); +void f_complete_match(typval_T *argvars, typval_T *rettv); void f_complete_info(typval_T *argvars, typval_T *rettv); void ins_compl_delete(void); void ins_compl_insert(int move_cursor); void ins_compl_check_keys(int frequency, int in_compl_func); int ins_complete(int c, int enable_pum); -void free_insexpand_stuff(void); -int ins_compl_cancel(void); -void f_complete_match(typval_T *argvars, typval_T *rettv); int ins_compl_setup_autocompl(int c); -void set_buflocal_cpt_callbacks(buf_T *buf); -int set_cpt_callbacks(optset_T *args); -void clear_cpt_callbacks(callback_T **cb, int count); -int set_ref_in_cpt_callbacks(callback_T *callbacks, int count, int copyID); +void free_insexpand_stuff(void); /* vim: set ft=c : */ diff --git a/src/proto/option.pro b/src/proto/option.pro index 7429002be..f1f8a33a4 100644 --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -1,5 +1,4 @@ /* option.c */ -char *did_set_showtabpanel(optset_T *args); void set_init_1(int clean_arg); void set_fencs_unicode(void); void set_string_default(char *name, char_u *val); @@ -64,8 +63,8 @@ char *did_set_previewwindow(optset_T *args); char *did_set_pyxversion(optset_T *args); char *did_set_readonly(optset_T *args); char *did_set_scrollbind(optset_T *args); -char *did_set_shellslash(optset_T *args); char *did_set_maxsearchcount(optset_T *args); +char *did_set_shellslash(optset_T *args); char *did_set_shiftwidth_tabstop(optset_T *args); char *did_set_showtabline(optset_T *args); char *did_set_smoothscroll(optset_T *args); @@ -154,4 +153,5 @@ dict_T *get_winbuf_options(int bufopt); int fill_culopt_flags(char_u *val, win_T *wp); int magic_isset(void); int option_set_callback_func(char_u *optval, callback_T *optcb); +char *did_set_showtabpanel(optset_T *args); /* vim: set ft=c : */ diff --git a/src/proto/optionstr.pro b/src/proto/optionstr.pro index 9fb8af7e2..734959b60 100644 --- a/src/proto/optionstr.pro +++ b/src/proto/optionstr.pro @@ -1,6 +1,4 @@ /* optionstr.c */ -char *did_set_tabpanelopt(optset_T *args); -int expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches); 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); @@ -34,7 +32,7 @@ int expand_set_buftype(optexpand_T *args, int *numMatches, char_u ***matches); char *did_set_casemap(optset_T *args); int expand_set_casemap(optexpand_T *args, int *numMatches, char_u ***matches); int expand_set_clipboard(optexpand_T *args, int *numMatches, char_u ***matches); -char * did_set_clipmethod(optset_T *args); +char *did_set_clipmethod(optset_T *args); int expand_set_clipmethod(optexpand_T *args, int *numMatches, char_u ***matches); char *did_set_chars_option(optset_T *args); int expand_set_chars_option(optexpand_T *args, int *numMatches, char_u ***matches); @@ -139,6 +137,8 @@ char *did_set_renderoptions(optset_T *args); char *did_set_rightleftcmd(optset_T *args); int expand_set_rightleftcmd(optexpand_T *args, int *numMatches, char_u ***matches); char *did_set_rulerformat(optset_T *args); +char *did_set_tabpanelopt(optset_T *args); +int expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches); char *did_set_scrollopt(optset_T *args); int expand_set_scrollopt(optexpand_T *args, int *numMatches, char_u ***matches); char *did_set_wlseat(optset_T *args); diff --git a/src/proto/popupwin.pro b/src/proto/popupwin.pro index d8df6f35a..e92d5eb21 100644 --- a/src/proto/popupwin.pro +++ b/src/proto/popupwin.pro @@ -64,8 +64,8 @@ void f_popup_findpreview(typval_T *argvars, typval_T *rettv); int popup_create_preview_window(int info); void popup_close_preview(void); void popup_hide_info(void); -int popup_overlaps_cmdline(void); void popup_close_info(void); +int popup_overlaps_cmdline(void); win_T *popup_get_message_win(void); void popup_show_message_win(void); int popup_message_win_visible(void); diff --git a/src/proto/tabpanel.pro b/src/proto/tabpanel.pro index 617f802c2..d62d13f3a 100644 --- a/src/proto/tabpanel.pro +++ b/src/proto/tabpanel.pro @@ -1,7 +1,7 @@ /* tabpanel.c */ +int tabpanelopt_changed(void); int tabpanel_width(void); int tabpanel_leftcol(void); -int tabpanelopt_changed(void); void draw_tabpanel(void); int get_tabpagenr_on_tabpanel(void); /* vim: set ft=c : */ diff --git a/src/proto/usercmd.pro b/src/proto/usercmd.pro index dcf2a1dbe..8c53f562b 100644 --- a/src/proto/usercmd.pro +++ b/src/proto/usercmd.pro @@ -9,7 +9,7 @@ char_u *get_user_cmd_addr_type(expand_T *xp, int idx); char_u *get_user_cmd_flags(expand_T *xp, int idx); char_u *get_user_cmd_nargs(expand_T *xp, int idx); char_u *get_user_cmd_complete(expand_T *xp, int idx); -char_u *cmdcomplete_type_to_str(int expand, char_u *arg); +char_u *cmdcomplete_type_to_str(int expand, char_u *compl_arg); int cmdcomplete_str_to_type(char_u *complete_str); char *uc_fun_cmd(void); int parse_compl_arg(char_u *value, int vallen, int *complp, long *argt, char_u **compl_arg); diff --git a/src/proto/vim9generics.pro b/src/proto/vim9generics.pro index 2fcae4db7..2d7c5d79c 100644 --- a/src/proto/vim9generics.pro +++ b/src/proto/vim9generics.pro @@ -2,7 +2,7 @@ char_u *generic_func_find_open_bracket(char_u *name); int skip_generic_func_type_args(char_u **argp); char_u *append_generic_func_type_args(char_u *funcname, size_t namelen, char_u **argp); -char_u *get_generic_func_name(ufunc_T *fp, char_u **arg); +char_u *get_generic_func_name(ufunc_T *fp, char_u **argp); char_u *parse_generic_func_type_args(char_u *func_name, size_t namelen, char_u *start, gfargs_tab_T *gfatab, cctx_T *cctx); char_u *parse_generic_func_type_params(char_u *func_name, char_u *p, gfargs_tab_T *gfatab, cctx_T *cctx); void generic_func_init(ufunc_T *fp, gfargs_tab_T *gfatab); @@ -10,10 +10,10 @@ void generic_func_args_table_init(gfargs_tab_T *gfatab); int generic_func_args_table_size(gfargs_tab_T *gfatab); void generic_func_args_table_clear(gfargs_tab_T *gfatab); void copy_generic_function(ufunc_T *fp, ufunc_T *new_fp); -ufunc_T *eval_generic_func(ufunc_T *ufunc, char_u *name, char_u **arg); -int generic_func_call(char_u **arg); +ufunc_T *eval_generic_func(ufunc_T *ufunc, char_u *name, char_u **argp); +int generic_func_call(char_u **argp); ufunc_T *generic_func_get(ufunc_T *fp, gfargs_tab_T *gfatab); -ufunc_T *find_generic_func(ufunc_T *ufunc, char_u *name, char_u **arg); -type_T *find_generic_type(char_u *type_name, size_t namelen, ufunc_T *ufunc, cctx_T *cctx); +ufunc_T *find_generic_func(ufunc_T *ufunc, char_u *name, char_u **argp); +type_T *find_generic_type(char_u *gt_name, size_t name_len, ufunc_T *ufunc, cctx_T *cctx); void generic_func_clear_items(ufunc_T *fp); /* vim: set ft=c : */ diff --git a/src/version.c b/src/version.c index deae1c7bb..2f6fbeb82 100644 --- a/src/version.c +++ b/src/version.c @@ -719,6 +719,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1631, /**/ 1630, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1umdPj-00Eztc-QY%40256bit.org.