patch 8.1.0443: unnecessary static function prototypesv8.1.0443

Problem:    Unnecessary static function prototypes.
Solution:   Remove unnecessary prototypes.

61 files changed, 21 insertions, 770 deletions

diff --git a/src/arabic.c b/src/arabic.c
index 9bc1669196..6c15221f66 100644
--- a/src/arabic.c
+++ b/src/arabic.c
@@ -17,20 +17,6 @@
 
 #if defined(FEAT_ARABIC) || defined(PROTO)
 
-static int  A_is_a(int cur_c);
-static int  A_is_s(int cur_c);
-static int  A_is_f(int cur_c);
-static int  chg_c_a2s(int cur_c);
-static int  chg_c_a2i(int cur_c);
-static int  chg_c_a2m(int cur_c);
-static int  chg_c_a2f(int cur_c);
-#if 0
-static int  chg_c_i2m(int cur_c);
-#endif
-static int  chg_c_f2m(int cur_c);
-static int  chg_c_laa2i(int hid_c);
-static int  chg_c_laa2f(int hid_c);
-static int  half_shape(int c);
 static int  A_firstc_laa(int c1, int c);
 static int  A_is_harakat(int c);
 static int  A_is_iso(int c);
diff --git a/src/blowfish.c b/src/blowfish.c
index eaf0b9ed56..e361d98cd4 100644
--- a/src/blowfish.c
+++ b/src/blowfish.c
@@ -56,13 +56,6 @@ typedef struct {
 } bf_state_T;
 
 
-static void bf_e_block(bf_state_T *state, UINT32_T *p_xl, UINT32_T *p_xr);
-static void bf_e_cblock(bf_state_T *state, char_u *block);
-static int bf_check_tables(UINT32_T pax[18], UINT32_T sbx[4][256], UINT32_T val);
-static int bf_self_test(void);
-static void bf_key_init(bf_state_T *state, char_u *password, char_u *salt, int salt_len);
-static void bf_cfb_init(bf_state_T *state, char_u *seed, int seed_len);
-
 /* Blowfish code */
 static UINT32_T pax_init[18] = {
     0x243f6a88u, 0x85a308d3u, 0x13198a2eu,
diff --git a/src/buffer.c b/src/buffer.c
index a4afe132e0..35dd65fc9c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -51,10 +51,6 @@ static void	clear_wininfo(buf_T *buf);
 # define dev_T unsigned
 #endif
 
-#if defined(FEAT_SIGNS)
-static void insert_sign(buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr);
-#endif
-
 #if defined(FEAT_QUICKFIX)
 static char *msg_loclist = N_("[Location List]");
 static char *msg_qflist = N_("[Quickfix List]");
@@ -2839,8 +2835,6 @@ buflist_setfpos(
 }
 
 #ifdef FEAT_DIFF
-static int wininfo_other_tab_diff(wininfo_T *wip);
-
 /*
  * Return TRUE when "wip" has 'diff' set and the diff is only for another tab
  * page.  That's because a diff is local to a tab page.
diff --git a/src/charset.c b/src/charset.c
index a4816887e4..0280954538 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -9,10 +9,6 @@
 
 #include "vim.h"
 
-#ifdef FEAT_LINEBREAK
-static int win_chartabsize(win_T *wp, char_u *p, colnr_T col);
-#endif
-
 #ifdef FEAT_MBYTE
 # if defined(HAVE_WCHAR_H)
 #  include <wchar.h>	    /* for towupper() and towlower() */
diff --git a/src/crypt_zip.c b/src/crypt_zip.c
index 08cf6082cf..e50fa6b1c5 100644
--- a/src/crypt_zip.c
+++ b/src/crypt_zip.c
@@ -36,8 +36,6 @@ typedef struct {
 } zip_state_T;
 
 
-static void make_crc_tab(void);
-
 static u32_T crc_32_table[256];
 
 /*
diff --git a/src/digraph.c b/src/digraph.c
index 6909c5b9c7..e707b058d5 100644
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -28,7 +28,6 @@ typedef struct digraph
     result_T	result;
 } digr_T;
 
-static int getexactdigraph(int, int, int);
 static void printdigraph(digr_T *);
 
 /* digraphs added by the user */
diff --git a/src/edit.c b/src/edit.c
index 72dc586222..4b9bdffb47 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -155,15 +155,9 @@ static void ins_ctrl_x(void);
 static int  has_compl_option(int dict_opt);
 static int  ins_compl_accept_char(int c);
 static int ins_compl_add(char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup);
-static int  ins_compl_equal(compl_T *match, char_u *str, int len);
 static void ins_compl_longest_match(compl_T *match);
-static void ins_compl_add_matches(int num_matches, char_u **matches, int icase);
-static int  ins_compl_make_cyclic(void);
-static void ins_compl_upd_pum(void);
 static void ins_compl_del_pum(void);
 static int  pum_wanted(void);
-static int  pum_enough_matches(void);
-static void ins_compl_dictionaries(char_u *dict, char_u *pat, int flags, int thesaurus);
 static void ins_compl_files(int count, char_u **files, int thesaurus, int flags, regmatch_T *regmatch, char_u *buf, int *dir);
 static char_u *find_line_end(char_u *ptr);
 static void ins_compl_free(void);
@@ -178,19 +172,15 @@ static void ins_compl_set_original_text(char_u *str);
 static void ins_compl_addfrommatch(void);
 static int  ins_compl_prep(int c);
 static void ins_compl_fixRedoBufForLeader(char_u *ptr_arg);
-static buf_T *ins_compl_next_buf(buf_T *buf, int flag);
 # if defined(FEAT_COMPL_FUNC) || defined(FEAT_EVAL)
 static void ins_compl_add_list(list_T *list);
 static void ins_compl_add_dict(dict_T *dict);
 # endif
-static int  ins_compl_get_exp(pos_T *ini);
 static void ins_compl_delete(void);
 static void ins_compl_insert(int in_compl_func);
-static int  ins_compl_next(int allow_get_expansion, int count, int insert_match, int in_compl_func);
 static int  ins_compl_key2dir(int c);
 static int  ins_compl_pum_key(int c);
 static int  ins_compl_key2count(int c);
-static int  ins_compl_use_match(int c);
 static int  ins_complete(int c, int enable_pum);
 static void show_pum(int prev_w_wrow, int prev_w_leftcol);
 static unsigned  quote_meta(char_u *dest, char_u *str, int len);
@@ -212,7 +202,6 @@ static void internal_format(int textwidth, int second_indent, int flags, int for
 static void check_auto_format(int);
 static void redo_literal(int c);
 static void start_arrow(pos_T *end_insert_pos);
-static void start_arrow_with_change(pos_T *end_insert_pos, int change);
 static void start_arrow_common(pos_T *end_insert_pos, int change);
 #ifdef FEAT_SPELL
 static void check_spell_redraw(void);
@@ -221,9 +210,7 @@ static int  spell_bad_len = 0;	/* length of located bad word */
 #endif
 static void stop_insert(pos_T *end_insert_pos, int esc, int nomove);
 static int  echeck_abbr(int);
-static int  replace_pop(void);
 static void replace_join(int off);
-static void replace_pop_ins(void);
 #ifdef FEAT_MBYTE
 static void mb_replace_pop_ins(int cc);
 #endif
@@ -9052,8 +9039,6 @@ ins_del(void)
     AppendCharToRedobuff(K_DEL);
 }
 
-static void ins_bs_one(colnr_T *vcolp);
-
 /*
  * Delete one character for ins_bs().
  */
diff --git a/src/eval.c b/src/eval.c
index 358217a824..4f457a457b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -232,7 +232,6 @@ static int eval5(char_u **arg, typval_T *rettv, int evaluate);
 static int eval6(char_u **arg, typval_T *rettv, int evaluate, int want_string);
 static int eval7(char_u **arg, typval_T *rettv, int evaluate, int want_string);
 
-static int eval_index(char_u **arg, typval_T *rettv, int evaluate, int verbose);
 static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate);
 static int get_lit_string_tv(char_u **arg, typval_T *rettv, int evaluate);
 static int free_unref_items(int copyID);
@@ -3050,8 +3049,6 @@ del_menutrans_vars(void)
  * get_user_var_name().
  */
 
-static char_u *cat_prefix_varname(int prefix, char_u *name);
-
 static char_u	*varnamebuf = NULL;
 static int	varnamebuflen = 0;
 
@@ -7957,6 +7954,7 @@ get_user_input(
 	if (defstr != NULL)
 	{
 	    int save_ex_normal_busy = ex_normal_busy;
+
 	    ex_normal_busy = 0;
 	    rettv->vval.v_string =
 		getcmdline_prompt(secret ? NUL : '@', p, echo_attr,
@@ -8507,8 +8505,6 @@ typedef enum
     VAR_FLAVOUR_VIMINFO		/* all uppercase */
 } var_flavour_T;
 
-static var_flavour_T var_flavour(char_u *varname);
-
     static var_flavour_T
 var_flavour(char_u *varname)
 {
@@ -9431,9 +9427,6 @@ var_exists(char_u *var)
 /*
  * Functions for ":8" filename modifier: get 8.3 version of a filename.
  */
-static int get_short_pathname(char_u **fnamep, char_u **bufp, int *fnamelen);
-static int shortpath_for_invalid_fname(char_u **fname, char_u **bufp, int *fnamelen);
-static int shortpath_for_partial(char_u **fnamep, char_u **bufp, int *fnamelen);
 
 /*
  * Get the short path (8.3) for the filename in "fnamep".
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 9faa89ff4e..dd9bc1811f 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -1121,8 +1121,6 @@ get_tv_lnum(typval_T *argvars)
 }
 
 #ifdef FEAT_FLOAT
-static int get_float_arg(typval_T *argvars, float_T *f);
-
 /*
  * Get the float value of "argvars[0]" into "f".
  * Returns FAIL when the argument is not a Number or Float.
@@ -1722,8 +1720,6 @@ f_browsedir(typval_T *argvars UNUSED, typval_T *rettv)
     rettv->v_type = VAR_STRING;
 }
 
-static buf_T *find_buffer(typval_T *avar);
-
 /*
  * Find a buffer by number or exact name.
  */
@@ -3826,8 +3822,6 @@ f_fnamemodify(typval_T *argvars, typval_T *rettv)
     vim_free(fbuf);
 }
 
-static void foldclosed_both(typval_T *argvars, typval_T *rettv, int end);
-
 /*
  * "foldclosed()" function
  */
@@ -4485,8 +4479,6 @@ f_getbufinfo(typval_T *argvars, typval_T *rettv)
     }
 }
 
-static void get_buffer_lines(buf_T *buf, linenr_T start, linenr_T end, int retlist, typval_T *rettv);
-
 /*
  * Get line or list of lines from buffer "buf" into "rettv".
  * Return a range (from start to end) of lines in rettv from the specified
@@ -7566,8 +7558,6 @@ f_localtime(typval_T *argvars UNUSED, typval_T *rettv)
     rettv->vval.v_number = (varnumber_T)time(NULL);
 }
 
-static void get_maparg(typval_T *argvars, typval_T *rettv, int exact);
-
     static void
 get_maparg(typval_T *argvars, typval_T *rettv, int exact)
 {
@@ -8177,8 +8167,6 @@ f_matchstrpos(typval_T *argvars, typval_T *rettv)
     find_some_match(argvars, rettv, MATCH_POS);
 }
 
-static void max_min(typval_T *argvars, typval_T *rettv, int domax);
-
     static void
 max_min(typval_T *argvars, typval_T *rettv, int domax)
 {
@@ -8261,8 +8249,6 @@ f_min(typval_T *argvars, typval_T *rettv)
     max_min(argvars, rettv, FALSE);
 }
 
-static int mkdir_recurse(char_u *dir, int prot);
-
 /*
  * Create the directory in which "dir" is located, and higher levels when
  * needed.
@@ -9057,8 +9043,6 @@ f_reg_recording(typval_T *argvars UNUSED, typval_T *rettv)
 }
 
 #if defined(FEAT_RELTIME)
-static int list2proftime(typval_T *arg, proftime_T *tm);
-
 /*
  * Convert a List to proftime_T.
  * Return FAIL when there is something wrong.
@@ -9171,9 +9155,6 @@ f_reltimestr(typval_T *argvars UNUSED, typval_T *rettv)
 }
 
 #if defined(FEAT_CLIENTSERVER) && defined(FEAT_X11)
-static void make_connection(void);
-static int check_connection(void);
-
     static void
 make_connection(void)
 {
@@ -9843,8 +9824,6 @@ f_reverse(typval_T *argvars, typval_T *rettv)
 #define SP_END		0x40	    /* leave cursor at end of match */
 #define SP_COLUMN	0x80	    /* start at cursor column */
 
-static int get_search_arg(typval_T *varp, int *flagsp);
-
 /*
  * Get flags for a search function.
  * Possibly sets "p_ws".
@@ -10674,8 +10653,6 @@ f_setline(typval_T *argvars, typval_T *rettv)
     set_buffer_lines(curbuf, lnum, FALSE, &argvars[1], rettv);
 }
 
-static void set_qf_ll_list(win_T *wp, typval_T *list_arg, typval_T *action_arg, typval_T *what_arg, typval_T *rettv);
-
 /*
  * Used by "setqflist()" and "setloclist()" functions
  */
@@ -11215,7 +11192,6 @@ typedef struct
     int		item_compare_keep_zero;
 } sortinfo_T;
 static sortinfo_T	*sortinfo = NULL;
-static void	do_sort_uniq(typval_T *argvars, typval_T *rettv, int sort);
 #define ITEM_COMPARE_FAIL 999
 
 /*
@@ -12860,8 +12836,6 @@ f_tabpagenr(typval_T *argvars UNUSED, typval_T *rettv)
 }
 
 
-static int get_winnr(tabpage_T *tp, typval_T *argvar);
-
 /*
  * Common code for tabpagewinnr() and winnr().
  */
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 0c9644cc64..99c19f9136 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1813,7 +1813,6 @@ append_redir(
 
 #if defined(FEAT_VIMINFO) || defined(PROTO)
 
-static int no_viminfo(void);
 static int read_viminfo_barline(vir_T *virp, int got_encoding, int force, int writing);
 static void write_viminfo_version(FILE *fp_out);
 static void write_viminfo_barlines(vir_T *virp, FILE *fp_out);
@@ -7568,7 +7567,6 @@ struct sign
 static sign_T	*first_sign = NULL;
 static int	next_sign_typenr = 1;
 
-static int sign_cmd_idx(char_u *begin_cmd, char_u *end_cmd);
 static void sign_list_defined(sign_T *sp);
 static void sign_undefine(sign_T *sp, sign_T *sp_prev);
 
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index c0cb87f70a..032ebe93b9 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -68,7 +68,6 @@ typedef struct sn_prl_S
 #if defined(FEAT_EVAL) || defined(PROTO)
 static int debug_greedy = FALSE;	/* batch mode debugging: don't save
 					   and restore typeahead. */
-static int get_maxbacktrace_level(void);
 static void do_setdebugtracelevel(char_u *arg);
 static void do_checkbacktracelevel(void);
 static void do_showbacktrace(char_u *cmd);
@@ -573,7 +572,6 @@ static garray_T prof_ga = {0, 0, sizeof(struct debuggy), 4, NULL};
 #define DBG_FILE	2
 #define DBG_EXPR	3
 
-static int dbg_parsearg(char_u *arg, garray_T *gap);
 static linenr_T debuggy_find(int file,char_u *fname, linenr_T after, garray_T *gap, int *fp);
 
 /*
@@ -1611,7 +1609,6 @@ profile_divide(proftime_T *tm, int count, proftime_T *tm2)
 /*
  * Functions for profiling.
  */
-static void script_do_profile(scriptitem_T *si);
 static void script_dump_profile(FILE *fd);
 static proftime_T prof_wait_time;
 
@@ -2242,8 +2239,6 @@ can_abandon(buf_T *buf, int forceit)
 		|| forceit);
 }
 
-static void add_bufnum(int *bufnrs, int *bufnump, int nr);
-
 /*
  * Add a buffer number to "bufnrs", unless it's already there.
  */
@@ -2444,10 +2439,8 @@ buf_write_all(buf_T *buf, int forceit)
  * Code to handle the argument list.
  */
 
-static char_u	*do_one_arg(char_u *str);
 static int	do_arglist(char_u *str, int what, int after, int will_edit);
 static void	alist_check_arg_idx(void);
-static int	editing_arg_idx(win_T *win);
 static void	alist_add_list(int count, char_u **files, int after, int will_edit);
 #define AL_SET	1
 #define AL_ADD	2
@@ -4299,8 +4292,6 @@ static char_u *get_one_sourceline(struct source_cookie *sp);
 
 #if (defined(WIN32) && defined(FEAT_CSCOPE)) || defined(HAVE_FD_CLOEXEC)
 # define USE_FOPEN_NOINH
-static FILE *fopen_noinh_readbin(char *filename);
-
 /*
  * Special function to open a file without handle inheritance.
  * When possible the handle is closed on exec().
@@ -5291,8 +5282,6 @@ ex_checktime(exarg_T *eap)
 #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
 	&& (defined(FEAT_EVAL) || defined(FEAT_MULTI_LANG))
 # define HAVE_GET_LOCALE_VAL
-static char_u *get_locale_val(int what);
-
     static char_u *
 get_locale_val(int what)
 {
@@ -5410,8 +5399,6 @@ get_mess_lang(void)
 	|| ((defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
 		&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) \
 		&& !defined(LC_MESSAGES))
-static char_u *get_mess_env(void);
-
 /*
  * Get the language used for messages from the environment.
  */
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 25d70c4f82..2d233ace86 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -61,7 +61,6 @@ static char_u *get_user_command_name(int idx);
 # define IS_USER_CMDIDX(idx) (FALSE)
 #endif
 
-static int compute_buffer_local_count(int addr_type, int lnum, int local);
 #ifdef FEAT_EVAL
 static char_u	*do_one_cmd(char_u **, int, struct condstack *, char_u *(*fgetline)(int, void *, int), void *cookie);
 #else
@@ -116,7 +115,6 @@ static int	getargopt(exarg_T *eap);
 # define ex_cexpr		ex_ni
 #endif
 
-static int	check_more(int, int);
 static linenr_T get_address(exarg_T *, char_u **, int addr_type, int skip, int silent, int to_other_file, int address_count);
 static void	get_flags(exarg_T *eap);
 #if !defined(FEAT_PERL) \
@@ -498,9 +496,6 @@ struct dbg_stuff
     except_T	*current_exception;
 };
 
-static void save_dbg_stuff(struct dbg_stuff *dsp);
-static void restore_dbg_stuff(struct dbg_stuff *dsp);
-
     static void
 save_dbg_stuff(struct dbg_stuff *dsp)
 {
@@ -1633,9 +1628,6 @@ compute_buffer_local_count(int addr_type, int lnum, int offset)
     return buf->b_fnum;
 }
 
-static int current_win_nr(win_T *win);
-static int current_tab_nr(tabpage_T *tab);
-
     static int
 current_win_nr(win_T *win)
 {
@@ -4910,8 +4902,6 @@ correct_range(exarg_T *eap)
 }
 
 #ifdef FEAT_QUICKFIX
-static char_u	*skip_grep_pat(exarg_T *eap);
-
 /*
  * For a ":vimgrep" or ":vimgrepadd" command return a pointer past the
  * pattern.  Otherwise return eap->arg.
@@ -5818,12 +5808,6 @@ get_command_name(expand_T *xp UNUSED, int idx)
 #endif
 
 #if defined(FEAT_USR_CMDS) || defined(PROTO)
-static int	uc_add_command(char_u *name, size_t name_len, char_u *rep, long argt, long def, int flags, int compl, char_u *compl_arg, int addr_type, int force);
-static void	uc_list(char_u *name, size_t name_len);
-static int	uc_scan_attr(char_u *attr, size_t len, long *argt, long *def, int *flags, int *compl, char_u **compl_arg, int* attr_type_arg);
-static char_u	*uc_split_args(char_u *arg, size_t *lenp);
-static size_t	uc_check_code(char_u *code, size_t len, char_u *buf, ucmd_T *cmd, exarg_T *eap, char_u **split_buf, size_t *split_len);
-
     static int
 uc_add_command(
     char_u	*name,
diff --git a/src/ex_eval.c b/src/ex_eval.c
index f209c5f955..055e267979 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -15,7 +15,6 @@
 
 #if defined(FEAT_EVAL) || defined(PROTO)
 
-static void	free_msglist(struct msglist *l);
 static int	throw_exception(void *, except_type_T, char_u *);
 static char_u	*get_end_emsg(struct condstack *cstack);
 
@@ -65,11 +64,6 @@ static char_u	*get_end_emsg(struct condstack *cstack);
 # define THROW_ON_INTERRUPT_TRUE
 #endif
 
-static void	catch_exception(except_T *excp);
-static void	finish_exception(except_T *excp);
-static void	discard_exception(except_T *excp, int was_finished);
-static void	report_pending(int action, int pending, void *value);
-
 /*
  * When several errors appear in a row, setting "force_abort" is delayed until
  * the failing command returned.  "cause_abort" is set to TRUE meanwhile, in
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 644259863a..e37ebe2c9e 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -75,11 +75,6 @@ static int	hisnum[HIST_COUNT] = {0, 0, 0, 0, 0};
 static int	hislen = 0;		/* actual length of history tables */
 
 static int	hist_char2type(int c);
-
-static int	in_history(int, char_u *, int, int, int);
-# ifdef FEAT_EVAL
-static int	calc_hist_idx(int histype, int num);
-# endif
 #endif
 
 #ifdef FEAT_RIGHTLEFT
@@ -103,9 +98,6 @@ static void	draw_cmdline(int start, int len);
 static void	save_cmdline(struct cmdline_info *ccp);
 static void	restore_cmdline(struct cmdline_info *ccp);
 static int	cmdline_paste(int regname, int literally, int remcr);
-#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
-static void	redrawcmd_preedit(void);
-#endif
 #ifdef FEAT_WILDMENU
 static void	cmdline_del(int from);
 #endif
@@ -5049,8 +5041,6 @@ expand_cmdline(
  * Remove "@ab" if the top of 'helplang' is "ab" and the language of the first
  * tag matches it.  Otherwise remove "@en" if "en" is the only language.
  */
-static void	cleanup_help_tags(int num_file, char_u **file);
-
     static void
 cleanup_help_tags(int num_file, char_u **file)
 {
@@ -6707,8 +6697,6 @@ static int	viminfo_hisidx[HIST_COUNT] = {0, 0, 0, 0, 0};
 static int	viminfo_hislen[HIST_COUNT] = {0, 0, 0, 0, 0};
 static int	viminfo_add_at_front = FALSE;
 
-static int	hist_type2char(int type, int use_question);
-
 /*
  * Translate a history type number to the associated character.
  */
diff --git a/src/fileio.c b/src/fileio.c
index 93dbf0c699..90f8517db1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -39,9 +39,6 @@ static void check_marks_read(void);
 #ifdef FEAT_CRYPT
 static char_u *check_for_cryptkey(char_u *cryptkey, char_u *ptr, long *sizep, off_T *filesizep, int newfile, char_u *fname, int *did_ask);
 #endif
-#ifdef UNIX
-static void set_file_time(char_u *fname, time_t atime, time_t mtime);
-#endif
 static int set_rw_fname(char_u *fname, char_u *sfname);
 static int msg_add_fileformat(int eol_type);
 static void msg_add_eol(void);
@@ -129,10 +126,6 @@ static int get_win_fio_flags(char_u *ptr);
 static int get_mac_fio_flags(char_u *ptr);
 # endif
 #endif
-static int move_lines(buf_T *frombuf, buf_T *tobuf);
-#ifdef TEMPDIRNAMES
-static void vim_settempdir(char_u *tempdir);
-#endif
 static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
 
 /*
@@ -7884,16 +7877,7 @@ static int current_augroup = AUGROUP_DEFAULT;
 
 static int au_need_clean = FALSE;   /* need to delete marked patterns */
 
-static void show_autocmd(AutoPat *ap, event_T event);
-static void au_remove_pat(AutoPat *ap);
-static void au_remove_cmds(AutoPat *ap);
-static void au_cleanup(void);
-static int au_new_group(char_u *name);
-static void au_del_group(char_u *name);
-static event_T event_name2nr(char_u *start, char_u **end);
 static char_u *event_nr2name(event_T event);
-static char_u *find_end_event(char_u *arg, int have_group);
-static int event_ignored(event_T event);
 static int au_get_grouparg(char_u **argp);
 static int do_autocmd_event(event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group);
 static int apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap);
diff --git a/src/getchar.c b/src/getchar.c
index 6331cd76e3..679eae1603 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -108,17 +108,8 @@ static char_u	noremapbuf_init[TYPELEN_INIT];	/* initial typebuf.tb_noremap */
 
 static int	last_recorded_len = 0;	/* number of last recorded chars */
 
-static char_u	*get_buffcont(buf