Skip to content

Commit 3796c10

Browse files
h-eastchrisbra
authored andcommitted
patch 9.1.1838: proto files out of sync
Problem: proto files out of sync Solution: Update proto files (Hirohito Higashi) closes: #18517 Signed-off-by: Hirohito Higashi <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent ec19075 commit 3796c10

File tree

8 files changed

+12
-8
lines changed

8 files changed

+12
-8
lines changed

src/proto/if_mzsch.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* if_mzsch.c */
2+
Thread_Local_Variables *scheme_external_get_thread_local_variables(void);
23
int mzscheme_enabled(int verbose);
34
void mzvim_check_threads(void);
45
char *did_set_mzquantum(optset_T *args);

src/proto/insexpand.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ int has_compl_option(int dict_opt);
2626
int vim_is_ctrl_x_key(int c);
2727
int ins_compl_accept_char(int c);
2828
int ins_compl_add_infercase(char_u *str_arg, int len, int icase, char_u *fname, int dir, int cont_s_ipos, int score);
29+
int ins_compl_is_match_selected(void);
2930
int ins_compl_preinsert_longest(void);
3031
char_u *ins_compl_leader(void);
3132
int ins_compl_col_range_attr(linenr_T lnum, int col);
@@ -77,5 +78,4 @@ int ins_complete(int c, int enable_pum);
7778
void ins_compl_enable_autocomplete(void);
7879
void free_insexpand_stuff(void);
7980
void f_preinserted(typval_T *argvars, typval_T *rettv);
80-
int ins_compl_is_match_selected(void);
8181
/* vim: set ft=c : */

src/proto/optionstr.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ int expand_set_printoptions(optexpand_T *args, int *numMatches, char_u ***matche
136136
char *did_set_renderoptions(optset_T *args);
137137
char *did_set_rightleftcmd(optset_T *args);
138138
int expand_set_rightleftcmd(optexpand_T *args, int *numMatches, char_u ***matches);
139+
char *did_set_pumborder(optset_T *args);
140+
int expand_set_pumborder(optexpand_T *args, int *numMatches, char_u ***matches);
139141
char *did_set_rulerformat(optset_T *args);
140142
char *did_set_tabpanelopt(optset_T *args);
141143
int expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches);
@@ -209,6 +211,4 @@ int check_ff_value(char_u *p);
209211
void save_clear_shm_value(void);
210212
void restore_shm_value(void);
211213
void export_myvimdir(void);
212-
char *did_set_pumborder(optset_T *args);
213-
int expand_set_pumborder(optexpand_T *args, int *numMatches, char_u ***matches);
214214
/* vim: set ft=c : */

src/proto/os_amiga.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ void mch_set_shellsize(void);
3737
void mch_new_shellsize(void);
3838
int mch_call_shell(char_u *cmd, int options);
3939
void mch_breakcheck(int force);
40-
long Chk_Abort(void);
4140
int mch_expandpath(garray_T *gap, char_u *pat, int flags);
4241
int mch_has_exp_wildcard(char_u *p);
4342
int mch_has_wildcard(char_u *p);

src/proto/os_mswin.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ void display_errors(void);
2222
int mch_has_exp_wildcard(char_u *p);
2323
int mch_has_wildcard(char_u *p);
2424
int mch_chdir(char *path);
25+
int mch_char_avail(void);
26+
int mch_check_messages(void);
2527
int mch_icon_load(HANDLE *iconp);
2628
int mch_get_random(char_u *buf, int len);
2729
int mch_libcall(char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result);

src/proto/os_qnx.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* os_qnx.c */
22
void qnx_init(void);
3-
void qnx_clip_init (void);
3+
void qnx_clip_init(void);
44
int clip_mch_own_selection(Clipboard_T *cbd);
55
void clip_mch_lose_selection(Clipboard_T *cbd);
66
void clip_mch_request_selection(Clipboard_T *cbd);

src/proto/popupmenu.pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/* popupmenu.c */
2+
void pum_set_border(int enable);
3+
void pum_set_shadow(int enable);
4+
void pum_set_margin(int enable);
25
void pum_display(pumitem_T *array, int size, int selected);
36
void pum_call_update_screen(void);
47
int pum_under_menu(int row, int col, int only_redrawing);
@@ -18,8 +21,5 @@ void ui_may_remove_balloon(void);
1821
void pum_show_popupmenu(vimmenu_T *menu);
1922
void pum_make_popup(char_u *path_name, int use_mouse_pos);
2023
void pum_set_border_chars(int top, int right, int bottom, int left, int top_left, int top_right, int bottom_right, int bottom_left);
21-
void pum_set_border(int enable);
22-
void pum_set_shadow(int enable);
23-
void pum_set_margin(int enable);
2424
void put_shadow_char(int row, int col);
2525
/* vim: set ft=c : */

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ static char *(features[]) =
729729

730730
static int included_patches[] =
731731
{ /* Add new patch number below this line */
732+
/**/
733+
1838,
732734
/**/
733735
1837,
734736
/**/

0 commit comments

Comments
 (0)