patch 8.1.1891: functions used in one file are globalv8.1.1891

Problem:    Functions used in one file are global.
Solution:   Add "static". (Yegappan Lakshmanan, closes #4840)

32 files changed, 0 insertions, 72 deletions

diff --git a/src/proto/autocmd.pro b/src/proto/autocmd.pro
index 009c0c4fd..7aa1de656 100644
--- a/src/proto/autocmd.pro
+++ b/src/proto/autocmd.pro
@@ -15,7 +15,6 @@ void aucmd_restbuf(aco_save_T *aco);
 int apply_autocmds(event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf);
 int apply_autocmds_exarg(event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap);
 int apply_autocmds_retval(event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, int *retval);
-int has_cursorhold(void);
 int trigger_cursorhold(void);
 int has_cursormoved(void);
 int has_cursormovedI(void);
diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
index ac455679f..0378b1502 100644
--- a/src/proto/buffer.pro
+++ b/src/proto/buffer.pro
@@ -12,7 +12,6 @@ void handle_swap_exists(bufref_T *old_curbuf);
 char *do_bufdel(int command, char_u *arg, int addr_count, int start_bnr, int end_bnr, int forceit);
 int do_buffer(int action, int start, int dir, int count, int forceit);
 void set_curbuf(buf_T *buf, int action);
-void enter_buffer(buf_T *buf);
 void do_autochdir(void);
 void no_write_message(void);
 void no_write_message_nobang(buf_T *buf);
@@ -20,7 +19,6 @@ int curbuf_reusable(void);
 buf_T *buflist_new(char_u *ffname_arg, char_u *sfname_arg, linenr_T lnum, int flags);
 void free_buf_options(buf_T *buf, int free_p_ff);
 int buflist_getfile(int n, linenr_T lnum, int options, int forceit);
-void buflist_getfpos(void);
 buf_T *buflist_findname_exp(char_u *fname);
 buf_T *buflist_findname(char_u *ffname);
 int buflist_findpat(char_u *pattern, char_u *pattern_end, int unlisted, int diffmode, int curtab_only);
@@ -68,7 +66,6 @@ int buf_hide(buf_T *buf);
 char_u *buf_spname(buf_T *buf);
 void switch_to_win_for_buf(buf_T *buf, win_T **save_curwinp, tabpage_T **save_curtabp, bufref_T *save_curbuf);
 void restore_win_for_buf(win_T *save_curwin, tabpage_T *save_curtab, bufref_T *save_curbuf);
-int find_win_for_buf(buf_T *buf, win_T **wp, tabpage_T **tp);
 void set_buflisted(int on);
 int buf_contents_changed(buf_T *buf);
 void wipe_buffer(buf_T *buf, int aucmd);
diff --git a/src/proto/change.pro b/src/proto/change.pro
index de3a94a9d..f6b3599eb 100644
--- a/src/proto/change.pro
+++ b/src/proto/change.pro
@@ -8,7 +8,6 @@ void f_listener_remove(typval_T *argvars, typval_T *rettv);
 void may_invoke_listeners(buf_T *buf, linenr_T lnum, linenr_T lnume, int added);
 void invoke_listeners(buf_T *buf);
 void changed_bytes(linenr_T lnum, colnr_T col);
-void inserted_bytes(linenr_T lnum, colnr_T col, int added);
 void appended_lines(linenr_T lnum, long count);
 void appended_lines_mark(linenr_T lnum, long count);
 void deleted_lines(linenr_T lnum, long count);
diff --git a/src/proto/channel.pro b/src/proto/channel.pro
index 768049c55..6bf214706 100644
--- a/src/proto/channel.pro
+++ b/src/proto/channel.pro
@@ -8,10 +8,8 @@ int free_unused_channels_contents(int copyID, int mask);
 void free_unused_channels(int copyID, int mask);
 void channel_gui_register_all(void);
 channel_T *channel_open(char *hostname, int port_in, int waittime, void (*nb_close_cb)(void));
-channel_T *channel_open_func(typval_T *argvars);
 void channel_set_pipes(channel_T *channel, sock_T in, sock_T out, sock_T err);
 void channel_set_job(channel_T *channel, job_T *job, jobopt_T *options);
-void channel_set_req_callback(channel_T *channel, ch_part_T part, callback_T *callback, int id);
 void channel_buffer_free(buf_T *buf);
 void channel_write_any_lines(void);
 void channel_write_new_lines(buf_T *buf);
@@ -22,21 +20,14 @@ void channel_consume(channel_T *channel, ch_part_T part, int len);
 int channel_collapse(channel_T *channel, ch_part_T part, int want_nl);
 int channel_can_write_to(channel_T *channel);
 int channel_is_open(channel_T *channel);
-int channel_has_readahead(channel_T *channel, ch_part_T part);
 char *channel_status(channel_T *channel, int req_part);
-void channel_info(channel_T *channel, dict_T *dict);
 void channel_close(channel_T *channel, int invoke_close_cb);
-void channel_close_in(channel_T *channel);
 void channel_clear(channel_T *channel);
 void channel_free_all(void);
-void common_channel_read(typval_T *argvars, typval_T *rettv, int raw, int blob);
-channel_T *channel_fd2channel(sock_T fd, ch_part_T *partp);
 void channel_handle_events(int only_keep_open);
 int channel_any_keep_open(void);
 void channel_set_nonblock(channel_T *channel, ch_part_T part);
 int channel_send(channel_T *channel, ch_part_T part, char_u *buf_arg, int len_arg, char *fun);
-void ch_expr_common(typval_T *argvars, typval_T *rettv, int eval);
-void ch_raw_common(typval_T *argvars, typval_T *rettv, int eval);
 int channel_poll_setup(int nfd_in, void *fds_in, int *towait);
 int channel_poll_check(int ret_in, void *fds_in);
 int channel_select_setup(int maxfd_in, void *rfds_in, void *wfds_in, struct timeval *tv, struct timeval **tvp);
@@ -44,12 +35,7 @@ int channel_select_check(int ret_in, void *rfds_in, void *wfds_in);
 int channel_parse_messages(void);
 int channel_any_readahead(void);
 int set_ref_in_channel(int copyID);
-ch_part_T channel_part_send(channel_T *channel);
-ch_part_T channel_part_read(channel_T *channel);
-ch_mode_T channel_get_mode(channel_T *channel, ch_part_T part);
-int channel_get_timeout(channel_T *channel, ch_part_T part);
 void clear_job_options(jobopt_T *opt);
-void free_job_options(jobopt_T *opt);
 int get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2);
 void job_free_all(void);
 int job_any_running(void);
diff --git a/src/proto/charset.pro b/src/proto/charset.pro
index f60822ef0..c582a8cf2 100644
--- a/src/proto/charset.pro
+++ b/src/proto/charset.pro
@@ -29,7 +29,6 @@ int vim_isprintc_strict(int c);
 int lbr_chartabsize(char_u *line, unsigned char *s, colnr_T col);
 int lbr_chartabsize_adv(char_u *line, char_u **s, colnr_T col);
 int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *headp);
-int in_win_border(win_T *wp, colnr_T vcol);
 void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end);
 colnr_T getvcol_nolist(pos_T *posp);
 void getvvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end);
diff --git a/src/proto/dict.pro b/src/proto/dict.pro
index 93d61e7f4..388ddac9e 100644
--- a/src/proto/dict.pro
+++ b/src/proto/dict.pro
@@ -32,7 +32,6 @@ int dict_get_tv(char_u **arg, typval_T *rettv, int evaluate, int literal);
 void dict_extend(dict_T *d1, dict_T *d2, char_u *action);
 dictitem_T *dict_lookup(hashitem_T *hi);
 int dict_equal(dict_T *d1, dict_T *d2, int ic, int recursive);
-void dict_list(typval_T *argvars, typval_T *rettv, int what);
 void f_items(typval_T *argvars, typval_T *rettv);
 void f_keys(typval_T *argvars, typval_T *rettv);
 void f_values(typval_T *argvars, typval_T *rettv);
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 680b13184..55bb718c0 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -63,7 +63,6 @@ int string2float(char_u *text, float_T *value);
 pos_T *var2fpos(typval_T *varp, int dollar_lnum, int *fnum);
 int list2fpos(typval_T *arg, pos_T *posp, int *fnump, colnr_T *curswantp);
 int get_id_len(char_u **arg);
-int get_name_len(char_u **arg, char_u **alias, int evaluate, int verbose);
 char_u *find_name_end(char_u *arg, char_u **expr_start, char_u **expr_end, int flags);
 int eval_isnamec(int c);
 int eval_isnamec1(int c);
@@ -84,7 +83,6 @@ void set_reg_var(int c);
 char_u *v_exception(char_u *oldval);
 char_u *v_throwpoint(char_u *oldval);
 char_u *set_cmdarg(exarg_T *eap, char_u *oldarg);
-int get_var_tv(char_u *name, int len, typval_T *rettv, dictitem_T **dip, int verbose, int no_autoload);
 int handle_subscript(char_u **arg, typval_T *rettv, int evaluate, int verbose, char_u *start_leader, char_u **end_leaderp);
 typval_T *alloc_tv(void);
 void free_tv(typval_T *varp);
@@ -97,7 +95,6 @@ char_u *tv_get_string(typval_T *varp);
 char_u *tv_get_string_buf(typval_T *varp, char_u *buf);
 char_u *tv_get_string_chk(typval_T *varp);
 char_u *tv_get_string_buf_chk(typval_T *varp, char_u *buf);
-char_u *tv_stringify(typval_T *varp, char_u *buf);
 dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload);
 dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload);
 hashtab_T *find_var_ht(char_u *name, char_u **varname);
diff --git a/src/proto/ex_cmds.pro b/src/proto/ex_cmds.pro
index a0203e7d6..298de8fb9 100644
--- a/src/proto/ex_cmds.pro
+++ b/src/proto/ex_cmds.pro
@@ -22,7 +22,6 @@ int do_write(exarg_T *eap);
 int check_overwrite(exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int other);
 void ex_wnext(exarg_T *eap);
 void do_wqall(exarg_T *eap);
-int not_writing(void);
 int getfile(int fnum, char_u *ffname_arg, char_u *sfname_arg, int setpm, linenr_T lnum, int forceit);
 int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags, win_T *oldwin);
 void ex_append(exarg_T *eap);
diff --git a/src/proto/ex_eval.pro b/src/proto/ex_eval.pro
index cb7002a46..2b6bdc6b4 100644
--- a/src/proto/ex_eval.pro
+++ b/src/proto/ex_eval.pro
@@ -10,8 +10,6 @@ int do_intthrow(struct condstack *cstack);
 char *get_exception_string(void *value, except_type_T type, char_u *cmdname, int *should_free);
 void discard_current_exception(void);
 void report_make_pending(int pending, void *value);
-void report_resume_pending(int pending, void *value);
-void report_discard_pending(int pending, void *value);
 void ex_eval(exarg_T *eap);
 void ex_if(exarg_T *eap);
 void ex_endif(exarg_T *eap);
diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro
index bff664073..bf5bdad1c 100644
--- a/src/proto/fileio.pro
+++ b/src/proto/fileio.pro
@@ -1,5 +1,4 @@
 /* fileio.c */
-void filemess(buf_T *buf, char_u *name, char_u *s, int attr);
 int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags);
 int is_dev_fd_file(char_u *fname);
 int prep_exarg(exarg_T *eap, buf_T *buf);
diff --git a/src/proto/findfile.pro b/src/proto/findfile.pro
index ebab79273..3c2419a43 100644
--- a/src/proto/findfile.pro
+++ b/src/proto/findfile.pro
@@ -3,7 +3,6 @@ void *vim_findfile_init(char_u *path, char_u *filename, char_u *stopdirs, int le
 char_u *vim_findfile_stopdir(char_u *buf);
 void vim_findfile_cleanup(void *ctx);
 char_u *vim_findfile(void *search_ctx_arg);
-void vim_findfile_free_visited(void *search_ctx_arg);
 char_u *find_file_in_path(char_u *ptr, int len, int options, int first, char_u *rel_fname);
 void free_findfile(void);
 char_u *find_directory_in_path(char_u *ptr, int len, int options, char_u *rel_fname);
diff --git a/src/proto/getchar.pro b/src/proto/getchar.pro
index cde7ddfa4..9a4f2d585 100644
--- a/src/proto/getchar.pro
+++ b/src/proto/getchar.pro
@@ -30,8 +30,6 @@ int typebuf_changed(int tb_change_cnt);
 int typebuf_typed(void);
 int typebuf_maplen(void);
 void del_typebuf(int len, int offset);
-int alloc_typebuf(void);
-void free_typebuf(void);
 int save_typebuf(void);
 void save_typeahead(tasave_T *tp);
 void restore_typeahead(tasave_T *tp);
@@ -39,7 +37,6 @@ void openscript(char_u *name, int directly);
 void close_all_scripts(void);
 int using_script(void);
 void before_blocking(void);
-void updatescript(int c);
 int vgetc(void);
 int safe_vgetc(void);
 int plain_vgetc(void);
diff --git a/src/proto/gui.pro b/src/proto/gui.pro
index f8f80b5f9..2dc09a176 100644
--- a/src/proto/gui.pro
+++ b/src/proto/gui.pro
@@ -7,7 +7,6 @@ void gui_exit(int rc);
 void gui_shell_closed(void);
 int gui_init_font(char_u *font_list, int fontset);
 int gui_get_wide_font(void);
-void gui_set_cursor(int row, int col);
 void gui_update_cursor(int force, int clear_selection);
 void gui_position_menu(void);
 int gui_get_base_width(void);
@@ -17,8 +16,6 @@ void gui_may_resize_shell(void);
 int gui_get_shellsize(void);
 void gui_set_shellsize(int mustset, int fit_to_display, int direction);
 void gui_new_shellsize(void);
-void gui_reset_scroll_region(void);
-void gui_start_highlight(int mask);
 void gui_stop_highlight(int mask);
 void gui_clear_block(int row1, int col1, int row2, int col2);
 void gui_update_cursor_later(void);
@@ -28,14 +25,12 @@ void gui_can_update_cursor(void);
 void gui_disable_flush(void);
 void gui_enable_flush(void);
 void gui_may_flush(void);
-int gui_outstr_nowrap(char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back);
 void gui_undraw_cursor(void);
 void gui_redraw(int x, int y, int w, int h);
 int gui_redraw_block(int row1, int col1, int row2, int col2, int flags);
 int gui_wait_for_chars(long wtime, int tb_change_cnt);
 int gui_inchar(char_u *buf, int maxlen, long wtime, int tb_change_cnt);
 void gui_send_mouse_event(int button, int x, int y, int repeated_click, int_u modifiers);
-int gui_xy2colrow(int x, int y, int *colp);
 void gui_menu_cb(vimmenu_T *menu);
 void gui_init_which_components(char_u *oldval);
 int gui_use_tabline(void);
diff --git a/src/proto/indent.pro b/src/proto/indent.pro
index 277953eb1..71028ac33 100644
--- a/src/proto/indent.pro
+++ b/src/proto/indent.pro
@@ -2,9 +2,6 @@
 int cin_is_cinword(char_u *line);
 pos_T *find_start_comment(int ind_maxcomment);
 int cindent_on(void);
-int cin_islabel(void);
-int cin_iscase(char_u *s, int strict);
-int cin_isscopedecl(char_u *s);
 void parse_cino(buf_T *buf);
 int get_c_indent(void);
 int get_expr_indent(void);
diff --git a/src/proto/json.pro b/src/proto/json.pro
index d8afe1fb6..926c2bec4 100644
--- a/src/proto/json.pro
+++ b/src/proto/json.pro
@@ -1,7 +1,6 @@
 /* json.c */
 char_u *json_encode(typval_T *val, int options);
 char_u *json_encode_nr_expr(int nr, typval_T *val, int options);
-int json_decode_all(js_read_T *reader, typval_T *res, int options);
 int json_decode(js_read_T *reader, typval_T *res, int options);
 int json_find_end(js_read_T *reader, int options);
 void f_js_decode(typval_T *argvars, typval_T *rettv);
diff --git a/src/proto/list.pro b/src/proto/list.pro
index 2f5be0df0..3102bb288 100644
--- a/src/proto/list.pro
+++ b/src/proto/list.pro
@@ -1,7 +1,6 @@
 /* list.c */
 void list_add_watch(list_T *l, listwatch_T *lw);
 void list_rem_watch(list_T *l, listwatch_T *lwrem);
-void list_fix_watch(list_T *l, listitem_T *item);
 list_T *list_alloc(void);
 list_T *list_alloc_id(alloc_id_T id);
 int rettv_list_alloc(typval_T *rettv);
diff --git a/src/proto/mark.pro b/src/proto/mark.pro
index 663415773..602bfa28a 100644
--- a/src/proto/mark.pro
+++ b/src/proto/mark.pro
@@ -9,7 +9,6 @@ pos_T *getmark_buf(buf_T *buf, int c, int changefile);
 pos_T *getmark(int c, int changefile);
 pos_T *getmark_buf_fnum(buf_T *buf, int c, int changefile, int *fnum);
 pos_T *getnextmark(pos_T *startpos, int dir, int begin_line);
-void fname2fnum(xfmark_T *fm);
 void fmarks_check_names(buf_T *buf);
 int check_mark(pos_T *pos);
 void clrallmarks(buf_T *buf);
diff --git a/src/proto/menu.pro b/src/proto/menu.pro
index 411c040b4..95ee48b54 100644
--- a/src/proto/menu.pro
+++ b/src/proto/menu.pro
@@ -5,7 +5,6 @@ void remove_winbar(win_T *wp);
 char_u *set_context_in_menu_cmd(expand_T *xp, char_u *cmd, char_u *arg, int forceit);
 char_u *get_menu_name(expand_T *xp, int idx);
 char_u *get_menu_names(expand_T *xp, int idx);
-char_u *menu_name_skip(char_u *name);
 int get_menu_index(vimmenu_T *menu, int state);
 int menu_is_menubar(char_u *name);
 int menu_is_popup(char_u *name);
diff --git a/src/proto/message.pro b/src/proto/message.pro
index 04b674486..8d2223506 100644
--- a/src/proto/message.pro
+++ b/src/proto/message.pro
@@ -7,7 +7,6 @@ char_u *msg_strtrunc(char_u *s, int force);
 void trunc_string(char_u *s, char_u *buf, int room_in, int buflen);
 void reset_last_sourcing(void);
 void msg_source(int attr);
-int emsg_not_now(void);
 void ignore_error_for_testing(char_u *error);
 void do_perror(char *msg);
 int emsg(char *s);
@@ -43,7 +42,6 @@ void msg_prt_line(char_u *s, int list);
 void msg_puts(char *s);
 void msg_puts_title(char *s);
 void msg_outtrans_long_attr(char_u *longstr, int attr);
-void msg_outtrans_long_len_attr(char_u *longstr, int len, int attr);
 void msg_puts_attr(char *s, int attr);
 int message_filtered(char_u *msg);
 void may_clear_sb_text(void);
@@ -55,7 +53,6 @@ void msg_sb_eol(void);
 int msg_use_printf(void);
 void mch_errmsg(char *str);
 void mch_msg(char *str);
-void msg_moremsg(int full);
 void repeat_message(void);
 void msg_clr_eos(void);
 void msg_clr_eos_force(void);
@@ -73,7 +70,6 @@ void give_warning(char_u *message, int hl);
 void give_warning2(char_u *message, char_u *a1, int hl);
 void msg_advance(int col);
 int do_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd);
-void display_confirm_msg(void);
 int vim_dialog_yesno(int type, char_u *title, char_u *message, int dflt);
 int vim_dialog_yesnocancel(int type, char_u *title, char_u *message, int dflt);
 int vim_dialog_yesnoallcancel(int type, char_u *title, char_u *message, int dflt);
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index 3f58d3046..cdeaa2869 100644
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -60,7 +60,6 @@ char_u *concat_fnames(char_u *fname1, char_u *fname2, int sep);
 char_u *concat_str(char_u *str1, char_u *str2);
 void add_pathsep(char_u *p);
 char_u *FullName_save(char_u *fname, int force);
-void prepare_to_exit(void);
 void preserve_exit(void);
 int vim_fexists(char_u *fname);
 void line_breakcheck(void);
diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro
index 5d7ca4a92..698751792 100644
--- a/src/proto/misc2.pro
+++ b/src/proto/misc2.pro
@@ -64,7 +64,6 @@ void ga_add_string(garray_T *gap, char_u *p);
 void ga_concat(garray_T *gap, char_u *s);
 void ga_append(garray_T *gap, int c);
 void append_ga_line(garray_T *gap);
-int name_to_mod_mask(int c);
 int simplify_key(int key, int *modifiers);
 int handle_x_keys(int key);
 char_u *get_special_key_name(int c, int modifiers);
diff --git a/src/proto/ops.pro b/src/proto/ops.pro
index ed5877dfb..8bd82aa06 100644
--- a/src/proto/ops.pro
+++ b/src/proto/ops.pro
@@ -14,7 +14,6 @@ void op_reindent(oparg_T *oap, int (*how)(void));
 int get_expr_register(void);
 void set_expr_line(char_u *new_line);
 char_u *get_expr_line(void);
-char_u *get_expr_line_src(void);
 int valid_yank_reg(int regname, int writing);
 int get_yank_register(int regname, int writing);
 int may_get_selection(int regname);
@@ -42,7 +41,6 @@ void clear_registers(void);
 int op_yank(oparg_T *oap, int deleting, int mess);
 void do_put(int regname, int dir, long count, int flags);
 void adjust_cursor_eol(void);
-int preprocs_left(void);
 int get_register_name(int num);
 void ex_display(exarg_T *eap);
 char_u *skip_comment(char_u *line, int process, int include_space, int *is_comment);
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 86c751658..9712f8644 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -24,7 +24,6 @@ void set_string_option_direct_in_win(win_T *wp, char_u *name, int opt_idx, char_
 void set_string_option_direct_in_buf(buf_T *buf, char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
 int valid_spellang(char_u *val);
 char *check_colorcolumn(win_T *wp);
-char *check_stl_option(char_u *s);
 void set_term_option_sctx_idx(char *name, int opt_idx);
 int get_option_value(char_u *name, long *numval, char_u **stringval, int opt_flags);
 int get_option_value_strict(char_u *name, long *numval, char_u **stringval, int opt_type, void *from);
@@ -44,7 +43,6 @@ void unset_global_local_option(char_u *name, void *from);
 char_u *get_equalprg(void);
 void win_copy_options(win_T *wp_from, win_T *wp_to);
 void copy_winopt(winopt_T *from, winopt_T *to);
-void check_win_options(win_T *win);
 void clear_winopt(winopt_T *wop);
 void buf_copy_options(buf_T *buf, int flags);
 void reset_modifiable(void);
@@ -75,7 +73,6 @@ int tabstop_count(int *ts);
 int tabstop_first(int *ts);
 long get_sw_value(buf_T *buf);
 long get_sw_value_indent(buf_T *buf);
-long get_sw_value_pos(buf_T *buf, pos_T *pos);
 long get_sw_value_col(buf_T *buf, colnr_T col);
 long get_sts_value(void);
 long get_scrolloff_value(void);
diff --git a/src/proto/popupwin.pro b/src/proto/popupwin.pro
index 0fad5ae83..f3204439d 100644
--- a/src/proto/popupwin.pro
+++ b/src/proto/popupwin.pro
@@ -9,7 +9,6 @@ void popup_handle_scrollbar_click(win_T *wp, int row, int col);
 int popup_height(win_T *wp);
 int popup_width(win_T *wp);
 int popup_extra_width(win_T *wp);
-void popup_adjust_position(win_T *wp);
 int parse_previewpopup(win_T *wp);
 int parse_completepopup(win_T *wp);
 void popup_set_wantpos_cursor(win_T *wp, int width);
diff --git a/src/proto/profiler.pro b/src/proto/profiler.pro
index 64398f52c..5e0b6a214 100644
--- a/src/proto/profiler.pro
+++ b/src/proto/profiler.pro
@@ -10,9 +10,7 @@ void profile_zero(proftime_T *tm);
 void profile_divide(proftime_T *tm, int count, proftime_T *tm2);
 void profile_add(proftime_T *tm, proftime_T *tm2);
 void profile_self(proftime_T *self, proftime_T *total, proftime_T *children);
-void profile_get_wait(proftime_T *tm);
 void profile_sub_wait(proftime_T *tm, proftime_T *tma);
-int profile_equal(proftime_T *tm1, proftime_T *tm2);
 int profile_cmp(const proftime_T *tm1, const proftime_T *tm2);
 void ex_profile(exarg_T *eap);
 char_u *get_profile_name(expand_T *xp, int idx);
diff --git a/src/proto/quickfix.pro b/src/proto/quickfix.pro
index 3bca1448a..6607808ad 100644
--- a/src/proto/quickfix.pro
+++ b/src/proto/quickfix.pro
@@ -5,7 +5,6 @@ void qf_free_all(win_T *wp);
 void check_quickfix_busy(void);
 void copy_loclist_stack(win_T *from, win_T *to);
 void qf_jump(qf_info_T *qi, int dir, int errornr, int forceit);
-void qf_jump_newwin(qf_info_T *qi, int dir, int errornr, int forceit, int newwin);
 void qf_list(exarg_T *eap);
 void qf_age(exarg_T *eap);
 void qf_history(exarg_T *eap);
diff --git a/src/proto/spell.pro b/src/proto/spell.pro
index 485d7d1a6..c2b14bf2c 100644
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@@ -19,7 +19,6 @@ buf_T *open_spellbuf(void);
 void close_spellbuf(buf_T *buf);
 void clear_spell_chartab(spelltab_T *sp);
 void init_spell_chartab(void);
-int spell_iswordp_nmw(char_u *p, win_T *wp);
 int spell_casefold(char_u *str, int len, char_u *buf, int buflen);
 int spell_check_sps(void);
 void spell_suggest(int count);
diff --git a/src/proto/term.pro b/src/proto/term.pro
index 136a9695e..ec73d505e 100644
--- a/src/proto/term.pro
+++ b/src/proto/term.pro
@@ -1,5 +1,4 @@
 /* term.c */
-guicolor_T termgui_mch_get_color(char_u *name);
 guicolor_T termgui_get_color(char_u *name);
 guicolor_T termgui_mch_get_rgb(guicolor_T color);
 int set_termname(char_u *term);
@@ -65,13 +64,11 @@ void clear_termcodes(void);
 void add_termcode(char_u *name, char_u *string, int flags);
 char_u *find_termcode(char_u *name);
 char_u *get_termcode(int i);
-void del_termcode(char_u *name);
 void set_mouse_topline(win_T *wp);
 int check_termcode(int max_offset, char_u *buf, int bufsize, int *buflen);
 void term_get_fg_color(char_u *r, char_u *g, char_u *b);
 void term_get_bg_color(char_u *r, char_u *g, char_u *b);
 char_u *replace_termcodes(char_u *from, char_u **bufp, int from_part, int do_lt, int special);
-int find_term_bykeys(char_u *src);
 void show_termcodes(void);
 int show_one_termcode(char_u *name, char_u *code, int printit);
 char_u *translate_mapping(char_u *str);
diff --git a/src/proto/textprop.pro b/src/proto/textprop.pro
index a6775dbfd..f33c7a4be 100644
--- a/src/proto/textprop.pro
+++ b/src/proto/textprop.pro
@@ -6,7 +6,6 @@ proptype_T *text_prop_type_by_id(buf_T *buf, int id);
 void f_prop_clear(typval_T *argvars, typval_T *rettv);
 void f_prop_list(typval_T *argvars, typval_T *rettv);
 void f_prop_remove(typval_T *argvars, typval_T *rettv);
-void prop_type_set(typval_T *argvars, int add);
 void f_prop_type_add(typval_T *argvars, typval_T *rettv);
 void f_prop_type_change(typval_T *argvars, typval_T *rettv);
 void f_prop_type_delete(typval_T *argvars, typval_T *rettv);
diff --git a/src/proto/ui.pro b/src/proto/ui.pro
index 472da3601..50d3d5ea1 100644
--- a/src/proto/ui.pro
+++ b/src/proto/ui.pro
@@ -32,8 +32,6 @@ void clip_clear_selection(Clipboard_T *cbd);
 void clip_may_clear_selection(int row1, int row2);
 void clip_scroll_selection(int rows);
 void clip_copy_modeless_selection(int both);
-int clip_gen_own_selection(Clipboard_T *cbd);
-void clip_gen_lose_selection(Clipboard_T *cbd);
 void clip_gen_set_selection(Clipboard_T *cbd);
 void clip_gen_request_selection(Clipboard_T *cbd);
 int clip_gen_owner_exists(Clipboard_T *cbd);
@@ -61,7 +59,6 @@ void clip_x11_request_selection(Widget myShell, Display *dpy, Clipboard_T *cbd);
 void clip_x11_lose_selection(Widget myShell, Clipboard_T *cbd);
 int clip_x11_own_selection(Widget myShell, Clipboard_T *cbd);
 void clip_x11_set_selection(Clipboard_T *cbd);
-int clip_x11_owner_exists(Clipboard_T *cbd);
 void yank_cut_buffer0(Display *dpy, Clipboard_T *cbd);
 int jump_to_mouse(int flags, int *inclusive, int which_button);
 int mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump, int *plines_cache);
diff --git a/src/proto/undo.pro b/src/proto/undo.pro
index f2190bfea..de918fca5 100644
--- a/src/proto/undo.pro
+++ b/src/proto/undo.pro
@@ -20,7 +20,6 @@ void u_unchanged(buf_T *buf);
 void u_find_first_changed(void);
 void u_update_save_nr(buf_T *buf);
 void u_clearall(buf_T *buf);
-void u_saveline(linenr_T lnum);
 void u_clearline(void);
 void u_undoline(void);
 void u_blockfree(buf_T *buf);
diff --git a/src/proto/window.pro b/src/proto/window.pro
index ccb7a2c03..7b33836f8 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -18,14 +18,12 @@ void win_free_all(void);
 win_T *winframe_remove(win_T *win, int *dirp, tabpage_T *tp);
 void close_others(int message, int forceit);
 void curwin_init(void);
-void win_init_empty(win_T *wp);
 int win_alloc_first(void);
 win_T *win_alloc_popup_win(void);
 void win_init_popup_win(win_T *wp, buf_T *buf);
 void win_init_size(void);
 void free_tabpage(tabpage_T *tp);
 int win_new_tabpage(int after);
-int may_open_tabpage(void);
 int make_tabpages(int maxcount);
 int valid_tabpage(tabpage_T *tpc);
 int valid_tabpage_win(tabpage_T *tpc);
@@ -44,9 +42,7 @@ win_T *win_horz_neighbor(tabpage_T *tp, win_T *wp, int left, long count);
 void win_enter(win_T *wp, int undo_sync);
 win_T *buf_jump_open_win(buf_T *buf);
 win_T *buf_jump_open_tab(buf_T *buf);
-int win_unlisted(win_T *wp);
 void win_free_popup(win_T *win);
-void win_append(win_T *after, win_T *wp);
 void win_remove(win_T *wp, tabpage_T *tp);
 int win_alloc_lines(win_T *wp);
 void win_free_lsize(win_T *wp);