29 files changed, 984 insertions, 943 deletions

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 706f4ca8c..c325a9239 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -100,7 +100,7 @@ typedef struct
 #ifdef HAVE_SANDBOX
 static Scheme_Object *sandbox_file_guard(int, Scheme_Object **);
 static Scheme_Object *sandbox_network_guard(int, Scheme_Object **);
-static void sandbox_check();
+static void sandbox_check(void);
 #endif
 /*  Buffer-related commands */
 static Scheme_Object *buffer_new(buf_T *buf);
@@ -2441,7 +2441,8 @@ raise_vim_exn(const char *add_info)
     else
 	argv[0] = scheme_make_string(_("Vim error"));
 
-    argv[1] = scheme_current_continuation_marks();
+    /* TODO: proper argument */
+    argv[1] = scheme_current_continuation_marks(NULL);
 
     scheme_raise(scheme_make_struct_instance(vim_exn, 2, argv));
 }
@@ -2659,7 +2660,7 @@ static Scheme_Object *M_execute = NULL;
 static Scheme_Object *M_delete = NULL;
 
     static void
-sandbox_check()
+sandbox_check(void)
 {
     if (sandbox)
 	raise_vim_exn(_("not allowed in the Vim sandbox"));
diff --git a/src/if_tcl.c b/src/if_tcl.c
index fe43d23ce..4b089ce5d 100644
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -1564,7 +1564,9 @@ tclsetdelcmd(interp, reflist, vimobj, delcmd)
 	if (reflist->interp == interp && reflist->vimobj == vimobj)
 	{
 	    if (reflist->delcmd)
+	    {
 		Tcl_DecrRefCount(reflist->delcmd);
+	    }
 	    Tcl_IncrRefCount(delcmd);
 	    reflist->delcmd = delcmd;
 	    return TCL_OK;
diff --git a/src/link.sh b/src/link.sh
index 0ab07f03d..dc376d521 100755
--- a/src/link.sh
+++ b/src/link.sh
@@ -5,7 +5,8 @@
 # libraries when they exist, but this doesn't mean they are needed for Vim.
 #
 #      Author: Bram Moolenaar
-# Last change: 2005 Jan 25
+# Last change: 2006 Sep 26
+#     License: Public domain
 #
 # Warning: This fails miserably if the linker doesn't return an error code!
 #
diff --git a/src/po/README.txt b/src/po/README.txt
index 62ee389fb..d636eceac 100644
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -12,9 +12,9 @@ supported by iconv and will be automatically converted to the currently used
 encoding.
 
 The GNU gettext library, starting with version 0.10.36, uses a new format for
-some encodings.  This folows the C99 standard for strings.  It means that when
-a multi-byte character includes the 0x5c byte, this is not recognized as a
-backslash.  Since this format is incompatible with Solaris, Vim uses the old
+some encodings.  This follows the C99 standard for strings.  It means that
+when a multi-byte character includes the 0x5c byte, this is not recognized as
+a backslash.  Since this format is incompatible with Solaris, Vim uses the old
 format.  This is done by setting the OLD_PO_FILE_OUTPUT and OLD_PO_FILE_INPUT
 environment variables.  When you use the Makefile in this directory that will
 be done for you.  This does NOT work with gettext 0.10.36.  Don't use it, get
@@ -30,7 +30,7 @@ on MS-Windows.  Download the gettext packages, for example from:
 
 You might have to do the commands manually.  Example:
 
-   cd c:\vim\vim60
+   cd c:\vim\vim71
    mkdir runtime\lang\ja\LC_MESSAGES
    msgfmt -o runtime\lang\ja\LC_MESSAGES\vim.mo src\po\ja.po
 
diff --git a/src/po/pl.po b/src/po/pl.po
index 6f8ac50d0..4f4e29ff3 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -1,22 +1,22 @@
 # translation of pl.po to Polish
 # Polish Translation for Vim
 #
-# updated 2006 for vim-7.0
+# updated 2007 for vim-7.0
 #
 # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
-# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006.
+# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-27 18:27+0200\n"
-"PO-Revision-Date: 2006-04-27 19:15+0200\n"
+"POT-Creation-Date: 2007-04-30 20:03+0200\n"
+"PO-Revision-Date: 2007-04-30 20:07+0200\n"
 "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
 "Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
 
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Nie mogę zarezerwować bufora; zakończenie..."
@@ -194,6 +194,9 @@ msgstr "E98: Nie mogę wczytać wyjścia różnicy"
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Bieżący bufor nie jest w trybie różnic"
 
+msgid "E793: No other buffer in diff mode is modifiable"
+msgstr "E793: Żaden inny bufor w trybie diff nie jest modyfikowalny"
+
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Brak innego bufora w trybie różnic"
 
@@ -619,6 +622,10 @@ msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Nieprawidłowy typ zmiennej dla: %s"
 
 #, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: Nie mogę usunąć zmiennej %s"
+
+#, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Wartość jest zablokowana: %s"
 
@@ -883,6 +890,7 @@ msgstr " zakładki"
 msgid " FAILED"
 msgstr " NIE POWIODŁO SIĘ"
 
+#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Plik viminfo jest niezapisywalny: %s"
@@ -1457,6 +1465,9 @@ msgstr "jest katalogiem"
 msgid "is not a file"
 msgstr "nie jest plikiem"
 
+msgid "is a device (disabled with 'opendevice' option"
+msgstr "jest urządzeniem (wyłączonym w opcji 'opendevice'"
+
 msgid "[New File]"
 msgstr "[Nowy Plik]"
 
@@ -1553,6 +1564,9 @@ msgstr "Częściowy zapis niemożliwy dla buforów NetBeans"
 msgid "is not a file or writable device"
 msgstr "nie jest plikiem lub zapisywalnym przyrządem"
 
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "zapisywanie do urządzenia wyłączone w opcji 'opendevice'"
+
 msgid "is read-only (add ! to override)"
 msgstr "jest tylko do odczytu (wymuś poprzez !)"
 
@@ -3288,6 +3302,9 @@ msgstr ""
 ",\n"
 "lub plik został uszkodzony."
 
+msgid " has been damaged (page size is smaller than minimum value).\n"
+msgstr " został uszkodzony (wielkość strony jest mniejsza niż najmniejsza wartość).\n"
+
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "Używam pliku wymiany \"%s\""
@@ -3626,6 +3643,10 @@ msgstr "E328: Menu istnieje tylko w innym trybie"
 msgid "E329: No menu \"%s\""
 msgstr "E329: Nie ma menu \"%s\""
 
+#. Only a mnemonic or accelerator is not valid.
+msgid "E792: Empty menu name"
+msgstr "E792: Pusta nazwa menu"
+
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: Trop menu nie może prowadzić do podmenu"
 
@@ -4999,6 +5020,7 @@ msgstr "Przykro mi, brak podpowiedzi"
 msgid "Sorry, only %ld suggestions"
 msgstr "Przykro mi, tylko %ld podpowiedzi"
 
+#. for when 'cmdheight' > 1
 #. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
@@ -5423,6 +5445,13 @@ msgstr ""
 
 msgid ""
 "\n"
+"MS-Windows 64 bit GUI version"
+msgstr ""
+"\n"
+"64 bitowa wersja GUI dla MS-Windows"
+
+msgid ""
+"\n"
 "MS-Windows 32 bit GUI version"
 msgstr ""
 "\n"
@@ -6016,8 +6045,8 @@ msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Nie mogę zmienić zmiennej tylko do odczytu \"%s\""
 
 #, c-format
-msgid "E46: Cannot set variable in the sandbox: \"%s\""
-msgstr "E46: Nie mogę ustawić zmiennej w piaskownicy: \"%s\""
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: Nie mogę ustawić zmiennej w piaskownicy: \"%s\""
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Błąd w trakcie czytania pliku błędów"
diff --git a/src/proto/edit.pro b/src/proto/edit.pro
index 3c76a9ebd..a967037cb 100644
--- a/src/proto/edit.pro
+++ b/src/proto/edit.pro
@@ -1,41 +1,41 @@
 /* edit.c */
-extern int edit __ARGS((int cmdchar, int startln, long count));
-extern void edit_putchar __ARGS((int c, int highlight));
-extern void edit_unputchar __ARGS((void));
-extern void display_dollar __ARGS((colnr_T col));
-extern void change_indent __ARGS((int type, int amount, int round, int replaced));
-extern void truncate_spaces __ARGS((char_u *line));
-extern void backspace_until_column __ARGS((int col));
-extern int vim_is_ctrl_x_key __ARGS((int c));
-extern int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
-extern void set_completion __ARGS((int startcol, list_T *list));
-extern void ins_compl_show_pum __ARGS((void));
-extern char_u *find_word_start __ARGS((char_u *ptr));
-extern char_u *find_word_end __ARGS((char_u *ptr));
-extern int ins_compl_active __ARGS((void));
-extern int ins_compl_add_tv __ARGS((typval_T *tv, int dir));
-extern void ins_compl_check_keys __ARGS((int frequency));
-extern int get_literal __ARGS((void));
-extern void insertchar __ARGS((int c, int flags, int second_indent));
-extern void auto_format __ARGS((int trailblank, int prev_line));
-extern int comp_textwidth __ARGS((int ff));
-extern int stop_arrow __ARGS((void));
-extern void set_last_insert __ARGS((int c));
-extern void free_last_insert __ARGS((void));
-extern char_u *add_char2buf __ARGS((int c, char_u *s));
-extern void beginline __ARGS((int flags));
-extern int oneright __ARGS((void));
-extern int oneleft __ARGS((void));
-extern int cursor_up __ARGS((long n, int upd_topline));
-extern int cursor_down __ARGS((long n, int upd_topline));
-extern int stuff_inserted __ARGS((int c, long count, int no_esc));
-extern char_u *get_last_insert __ARGS((void));
-extern char_u *get_last_insert_save __ARGS((void));
-extern void replace_push __ARGS((int c));
-extern void fixthisline __ARGS((int (*get_the_indent)(void)));
-extern void fix_indent __ARGS((void));
-extern int in_cinkeys __ARGS((int keytyped, int when, int line_is_empty));
-extern int hkmap __ARGS((int c));
-extern void ins_scroll __ARGS((void));
-extern void ins_horscroll __ARGS((void));
+int edit __ARGS((int cmdchar, int startln, long count));
+void edit_putchar __ARGS((int c, int highlight));
+void edit_unputchar __ARGS((void));
+void display_dollar __ARGS((colnr_T col));
+void change_indent __ARGS((int type, int amount, int round, int replaced));
+void truncate_spaces __ARGS((char_u *line));
+void backspace_until_column __ARGS((int col));
+int vim_is_ctrl_x_key __ARGS((int c));
+int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
+void set_completion __ARGS((int startcol, list_T *list));
+void ins_compl_show_pum __ARGS((void));
+char_u *find_word_start __ARGS((char_u *ptr));
+char_u *find_word_end __ARGS((char_u *ptr));
+int ins_compl_active __ARGS((void));
+int ins_compl_add_tv __ARGS((typval_T *tv, int dir));
+void ins_compl_check_keys __ARGS((int frequency));
+int get_literal __ARGS((void));
+void insertchar __ARGS((int c, int flags, int second_indent));
+void auto_format __ARGS((int trailblank, int prev_line));
+int comp_textwidth __ARGS((int ff));
+int stop_arrow __ARGS((void));
+void set_last_insert __ARGS((int c));
+void free_last_insert __ARGS((void));
+char_u *add_char2buf __ARGS((int c, char_u *s));
+void beginline __ARGS((int flags));
+int oneright __ARGS((void));
+int oneleft __ARGS((void));
+int cursor_up __ARGS((long n, int upd_topline));
+int cursor_down __ARGS((long n, int upd_topline));
+int stuff_inserted __ARGS((int c, long count, int no_esc));
+char_u *get_last_insert __ARGS((void));
+char_u *get_last_insert_save __ARGS((void));
+void replace_push __ARGS((int c));
+void fixthisline __ARGS((int (*get_the_indent)(void)));
+void fix_indent __ARGS((void));
+int in_cinkeys __ARGS((int keytyped, int when, int line_is_empty));
+int hkmap __ARGS((int c));
+void ins_scroll __ARGS((void));
+void ins_horscroll __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/proto/ex_cmds.pro b/src/proto/ex_cmds.pro
index 7582dffab..4382e6530 100644
--- a/src/proto/ex_cmds.pro
+++ b/src/proto/ex_cmds.pro
@@ -1,59 +1,59 @@
 /* ex_cmds.c */
-extern void do_ascii __ARGS((exarg_T *eap));
-extern void ex_align __ARGS((exarg_T *eap));
-extern void ex_sort __ARGS((exarg_T *eap));
-extern void ex_retab __ARGS((exarg_T *eap));
-extern int do_move __ARGS((linenr_T line1, linenr_T line2, linenr_T dest));
-extern void ex_copy __ARGS((linenr_T line1, linenr_T line2, linenr_T n));
-extern void free_prev_shellcmd __ARGS((void));
-extern void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
-extern void do_shell __ARGS((char_u *cmd, int flags));
-extern char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
-extern void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
-extern int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
-extern int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
-extern void write_viminfo __ARGS((char_u *file, int forceit));
-extern int viminfo_readline __ARGS((vir_T *virp));
-extern char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
-extern void viminfo_writestring __ARGS((FILE *fd, char_u *p));
-extern void do_fixdel __ARGS((exarg_T *eap));
-extern void print_line_no_prefix __ARGS((linenr_T lnum, int use_number, int list));
-extern void print_line __ARGS((linenr_T lnum, int use_number, int list));
-extern void ex_file __ARGS((exarg_T *eap));
-extern void ex_update __ARGS((exarg_T *eap));
-extern void ex_write __ARGS((exarg_T *eap));
-extern int do_write __ARGS((exarg_T *eap));
-extern void ex_wnext __ARGS((exarg_T *eap));
-extern void do_wqall __ARGS((exarg_T *eap));
-extern int not_writing __ARGS((void));
-extern int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
-extern int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags));
-extern void ex_append __ARGS((exarg_T *eap));
-extern void ex_change __ARGS((exarg_T *eap));
-extern void ex_z __ARGS((exarg_T *eap));
-extern int check_restricted __ARGS((void));
-extern int check_secure __ARGS((void));
-extern void do_sub __ARGS((exarg_T *eap));
-extern int do_sub_msg __ARGS((int count_only));
-extern void ex_global __ARGS((exarg_T *eap));
-extern void global_exe __ARGS((char_u *cmd));
-extern int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
-extern void write_viminfo_sub_string __ARGS((FILE *fp));
-extern void free_old_sub __ARGS((void));
-extern int prepare_tagpreview __ARGS((int undo_sync));
-extern void ex_help __ARGS((exarg_T *eap));
-extern char_u *check_help_lang __ARGS((char_u *arg));
-extern int help_heuristic __ARGS((char_u *matched_string, int offset, int wrong_case));
-extern int find_help_tags __ARGS((char_u *arg, int *num_matches, char_u ***matches, int keep_lang));
-extern void fix_help_buffer __ARGS((void));
-extern void ex_exusage __ARGS((exarg_T *eap));
-extern void ex_viusage __ARGS((exarg_T *eap));
-extern void ex_helptags __ARGS((exarg_T *eap));
-extern void ex_sign __ARGS((exarg_T *eap));
-extern void sign_gui_started __ARGS((void));
-extern int sign_get_attr __ARGS((int typenr, int line));
-extern char_u *sign_get_text __ARGS((int typenr));
-extern void *sign_get_image __ARGS((int typenr));
-extern char_u *sign_typenr2name __ARGS((int typenr));
-extern void ex_drop __ARGS((exarg_T *eap));
+void do_ascii __ARGS((exarg_T *eap));
+void ex_align __ARGS((exarg_T *eap));
+void ex_sort __ARGS((exarg_T *eap));
+void ex_retab __ARGS((exarg_T *eap));
+int do_move __ARGS((linenr_T line1, linenr_T line2, linenr_T dest));
+void ex_copy __ARGS((linenr_T line1, linenr_T line2, linenr_T n));
+void free_prev_shellcmd __ARGS((void));
+void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
+void do_shell __ARGS((char_u *cmd, int flags));
+char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
+int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
+void write_viminfo __ARGS((char_u *file, int forceit));
+int viminfo_readline __ARGS((vir_T *virp));
+char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
+void viminfo_writestring __ARGS((FILE *fd, char_u *p));
+void do_fixdel __ARGS((exarg_T *eap));
+void print_line_no_prefix __ARGS((linenr_T lnum, int use_number, int list));
+void print_line __ARGS((linenr_T lnum, int use_number, int list));
+void ex_file __ARGS((exarg_T *eap));
+void ex_update __ARGS((exarg_T *eap));
+void ex_write __ARGS((exarg_T *eap));
+int do_write __ARGS((exarg_T *eap));
+void ex_wnext __ARGS((exarg_T *eap));
+void do_wqall __ARGS((exarg_T *eap));
+int not_writing __ARGS((void));
+int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
+int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags));
+void ex_append __ARGS((exarg_T *eap));
+void ex_change __ARGS((exarg_T *eap));
+void ex_z __ARGS((exarg_T *eap));
+int check_restricted __ARGS((void));
+int check_secure __ARGS((void));
+void do_sub __ARGS((exarg_T *eap));
+int do_sub_msg __ARGS((int count_only));
+void ex_global __ARGS((exarg_T *eap));
+void global_exe __ARGS((char_u *cmd));
+int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
+void write_viminfo_sub_string __ARGS((FILE *fp));
+void free_old_sub __ARGS((void));
+int prepare_tagpreview __ARGS((int undo_sync));
+void ex_help __ARGS((exarg_T *eap));
+char_u *check_help_lang __ARGS((char_u *arg));
+int help_heuristic __ARGS((char_u *matched_string, int offset, int wrong_case));
+int find_help_tags __ARGS((char_u *arg, int *num_matches, char_u ***matches, int keep_lang));
+void fix_help_buffer __ARGS((void));
+void ex_exusage __ARGS((exarg_T *eap));
+void ex_viusage __ARGS((exarg_T *eap));
+void ex_helptags __ARGS((exarg_T *eap));
+void ex_sign __ARGS((exarg_T *eap));
+void sign_gui_started __ARGS((void));
+int sign_get_attr __ARGS((int typenr, int line));
+char_u *sign_get_text __ARGS((int typenr));
+void *sign_get_image __ARGS((int typenr));
+char_u *sign_typenr2name __ARGS((int typenr));
+void ex_drop __ARGS((exarg_T *eap));
 /* vim: set ft=c : */
diff --git a/src/proto/ex_cmds2.pro b/src/proto/ex_cmds2.pro
index 9c8932949..11480f1ec 100644
--- a/src/proto/ex_cmds2.pro
+++ b/src/proto/ex_cmds2.pro
@@ -1,83 +1,83 @@
 /* ex_cmds2.c */
-extern void do_debug __ARGS((char_u *cmd));
-extern void ex_debug __ARGS((exarg_T *eap));
-extern void dbg_check_breakpoint __ARGS((exarg_T *eap));
-extern int dbg_check_skipped __ARGS((exarg_T *eap));
-extern void ex_breakadd __ARGS((exarg_T *eap));
-extern void ex_debuggreedy __ARGS((exarg_T *eap));
-extern void ex_breakdel __ARGS((exarg_T *eap));
-extern void ex_breaklist __ARGS((exarg_T *eap));
-extern linenr_T dbg_find_breakpoint __ARGS((int file, char_u *fname, linenr_T after));
-extern int has_profiling __ARGS((int file, char_u *fname, int *fp));
-extern void dbg_breakpoint __ARGS((char_u *name, linenr_T lnum));
-extern void profile_start __ARGS((proftime_T *tm));
-extern void profile_end __ARGS((proftime_T *tm));
-extern void profile_sub __ARGS((proftime_T *tm, proftime_T *tm2));
-extern char *profile_msg __ARGS((proftime_T *tm));
-extern void profile_zero __ARGS((proftime_T *tm));
-extern void profile_add __ARGS((proftime_T *tm, proftime_T *tm2));
-extern void profile_self __ARGS((proftime_T *self, proftime_T *total, proftime_T *children));
-extern void profile_get_wait __ARGS((proftime_T *tm));
-extern void profile_sub_wait __ARGS((proftime_T *tm, proftime_T *tma));
-extern int profile_equal __ARGS((proftime_T *tm1, proftime_T *tm2));
-extern int profile_cmp __ARGS((proftime_T *tm1, proftime_T *tm2));
-extern void ex_profile __ARGS((exarg_T *eap));
-extern void profile_dump __ARGS((void));
-extern void script_prof_save __ARGS((proftime_T *tm));
-extern void script_prof_restore __ARGS((proftime_T *tm));
-extern void prof_inchar_enter __ARGS((void));
-extern void prof_inchar_exit __ARGS((void));
-extern int prof_def_func __ARGS((void));
-extern int autowrite __ARGS((buf_T *buf, int forceit));
-extern void autowrite_all __ARGS((void));
-extern int check_changed __ARGS((buf_T *buf, int checkaw, int mult_win, int forceit, int allbuf));
-extern void browse_save_fname __ARGS((buf_T *buf));
-extern void dialog_changed __ARGS((buf_T *buf, int checkall));
-extern int can_abandon __ARGS((buf_T *buf, int forceit));
-extern int check_changed_any __ARGS((int hidden));
-extern int check_fname __ARGS((void));
-extern int buf_write_all __ARGS((buf_T *buf, int forceit));
-extern int get_arglist __ARGS((garray_T *gap, char_u *str));
-extern int get_arglist_exp __ARGS((char_u *str, int *fcountp, char_u ***fnamesp));
-extern void set_arglist __ARGS((char_u *str));
-extern void check_arg_idx __ARGS((win_T *win));
-extern void ex_args __ARGS((exarg_T *eap));
-extern void ex_previous __ARGS((exarg_T *eap));
-extern void ex_rewind __ARGS((exarg_T *eap));
-extern void ex_last __ARGS((exarg_T *eap));
-extern void ex_argument __ARGS((exarg_T *eap));
-extern void do_argfile __ARGS((exarg_T *eap, int argn));
-extern void ex_next __ARGS((exarg_T *eap));
-extern void ex_argedit __ARGS((exarg_T *eap));
-extern void ex_argadd __ARGS((exarg_T *eap));
-extern void ex_argdelete __ARGS((exarg_T *eap));
-extern void ex_listdo __ARGS((exarg_T *eap));
-extern void ex_compiler __ARGS((exarg_T *eap));
-extern void ex_runtime __ARGS((exarg_T *eap));
-extern int source_runtime __ARGS((char_u *name, int all));
-extern int do_in_runtimepath __ARGS((char_u *name, int all, void (*callback)(char_u *fname, void *ck), void *cookie));
-extern void ex_options __ARGS((exarg_T *eap));
-extern void ex_source __ARGS((exarg_T *eap));
-extern linenr_T *source_breakpoint __ARGS((void *cookie));
-extern int *source_dbg_tick __ARGS((void *cookie));
-extern int source_level __ARGS((void *cookie));
-extern int do_source __ARGS((char_u *fname, int check_other, int is_vimrc));
-extern void ex_scriptnames __ARGS((exarg_T *eap));
-extern void scriptnames_slash_adjust __ARGS((void));
-extern char_u *get_scriptname __ARGS((scid_T id));
-extern void free_scriptnames __ARGS((void));
-extern char *fgets_cr __ARGS((char *s, int n, FILE *stream));
-extern char_u *getsourceline __ARGS((int c, void *cookie, int indent));
-extern void script_line_start __ARGS((void));
-extern void script_line_exec __ARGS((void));
-extern void script_line_end __ARGS((void));
-extern void ex_scriptencoding __ARGS((exarg_T *eap));
-extern void ex_finish __ARGS((exarg_T *eap));
-extern void do_finish __ARGS((exarg_T *eap, int reanimate));
-extern int source_finished __ARGS((char_u *(*getline)(int, void *, int), void *cookie));
-extern void ex_checktime __ARGS((exarg_T *eap));
-extern char_u *get_mess_lang __ARGS((void));
-extern void set_lang_var __ARGS((void));
-extern void ex_language __ARGS((exarg_T *eap));
-extern char_u *get_lang_arg __ARGS((expand_T *xp, int idx));
+void do_debug __ARGS((char_u *cmd));
+void ex_debug __ARGS((exarg_T *eap));
+void dbg_check_breakpoint __ARGS((exarg_T *eap));
+int dbg_check_skipped __ARGS((exarg_T *eap));
+void ex_breakadd __ARGS((exarg_T *eap));
+void ex_debuggreedy __ARGS((exarg_T *eap));
+void ex_breakdel __ARGS((exarg_T *eap));
+void ex_breaklist __ARGS((exarg_T *eap));
+linenr_T dbg_find_breakpoint __ARGS((int file, char_u *fname, linenr_T after));
+int has_profiling __ARGS((int file, char_u *fname, int *fp));
+void dbg_breakpoint __ARGS((char_u *name, linenr_T lnum));
+void profile_start __ARGS((proftime_T *tm));
+void profile_end __ARGS((proftime_T *tm));
+void profile_sub __ARGS((proftime_T *tm, proftime_T *tm2));
+char *profile_msg __ARGS((proftime_T *tm));
+void profile_zero __ARGS((proftime_T *tm));
+void profile_add __ARGS((proftime_T *tm, proftime_T *tm2));
+void profile_self __ARGS((proftime_T *self, proftime_T *total, proftime_T *children));
+void profile_get_wait __ARGS((proftime_T *tm));
+void profile_sub_wait __ARGS((proftime_T *tm, proftime_T *tma));
+int profile_equal __ARGS((proftime_T *tm1, proftime_T *tm2));
+int profile_cmp __ARGS((proftime_T *tm1, proftime_T *tm2));
+void ex_profile __ARGS((exarg_T *eap));
+void profile_dump __ARGS((void));
+void script_prof_save __ARGS((proftime_T *tm));
+void script_prof_restore __ARGS((proftime_T *tm));
+void prof_inchar_enter __ARGS((void));
+void prof_inchar_exit __ARGS((void));
+int prof_def_func __ARGS((void));
+int autowrite __ARGS((buf_T *buf, int forceit));
+void autowrite_all __ARGS((void));
+int check_changed __ARGS((buf_T *buf, int checkaw, int mult_win, int forceit, int allbuf));
+void browse_save_fname __ARGS((buf_T *buf));
+void dialog_changed __ARGS((buf_T *buf, int checkall));
+int can_abandon __ARGS((buf_T *buf, int forceit));
+int check_changed_any __ARGS((int hidden));
+int check_fname __ARGS((void));
+int buf_write_all __ARGS((buf_T *buf, int forceit));
+int get_arglist __ARGS((garray_T *gap, char_u *str));
+int get_arglist_exp __ARGS((char_u *str, int *fcountp, char_u ***fnamesp));
+void set_arglist __ARGS((char_u *str));
+void check_arg_idx __ARGS((win_T *win));
+void ex_args __ARGS((exarg_T *eap));
+void ex_previous __ARGS((exarg_T *eap));
+void ex_rewind __ARGS((exarg_T *eap));
+void ex_last __ARGS((exarg_T *eap));
+void ex_argument __ARGS((exarg_T *eap));
+void do_argfile __ARGS((exarg_T *eap, int argn));
+void ex_next __ARGS((exarg_T *eap));
+void ex_argedit __ARGS((exarg_T *eap));
+void ex_argadd __ARGS((exarg_T *eap));
+void ex_argdelete __ARGS((exarg_T *eap));
+void ex_listdo __ARGS((exarg_T *eap));
+void ex_compiler __ARGS((exarg_T *eap));
+void ex_runtime __ARGS((exarg_T *eap));
+int source_runtime __ARGS((char_u *name, int all));
+int do_in_runtimepath __ARGS((char_u *name, int all, void (*callback)(char_u *fname, void *ck), void *cookie));
+void ex_options __ARGS((exarg_T *eap));
+void ex_source __ARGS((exarg_T *eap));
+linenr_T *source_breakpoint __ARGS((void *cookie));
+int *source_dbg_tick __ARGS((void *cookie));
+int source_level __ARGS((void *cookie));
+int do_source __ARGS((char_u *fname, int check_other, int is_vimrc));
+void ex_scriptnames __ARGS((exarg_T *eap));
+void scriptnames_slash_adjust __ARGS((void));
+char_u *get_scriptname __ARGS((scid_T id));
+void free_scriptnames __ARGS((void));
+char *fgets_cr __ARGS((char *s, int n, FILE *stream));
+char_u *getsourceline __ARGS((int c, void *cookie, int indent));
+void script_line_start __ARGS((void));
+void script_line_exec __ARGS((void));
+void script_line_end __ARGS((void));
+void ex_scriptencoding __ARGS((exarg_T *eap));
+void ex_finish __ARGS((exarg_T *eap));
+void do_finish __ARGS((exarg_T *eap, int reanimate));
+int source_finished __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie));
+void ex_checktime __ARGS((exarg_T *eap));
+char_u *get_mess_lang __ARGS((void));
+void set_lang_var __ARGS((void));
+void ex_language __ARGS((exarg_T *eap));
+char_u *get_lang_arg __ARGS((expand_T *xp, int idx));
 /* vim: set ft=c : */
diff --git a/src/proto/gui_beval.pro b/src/proto/gui_beval.pro
index 42e0082f9..33c1738d3 100644
--- a/src/proto/gui_beval.pro
+++ b/src/proto/gui_beval.pro
@@ -1,11 +1,11 @@
 /* gui_beval.c */
-extern void general_beval_cb __ARGS((BalloonEval *beval, int state));
-extern BalloonEval *gui_mch_create_beval_area __ARGS((void *target, char_u *mesg, void (*mesgCB)(BalloonEval *, int), void *clientData));
-extern void gui_mch_destroy_beval_area __ARGS((BalloonEval *beval));
-extern void gui_mch_enable_beval_area __ARGS((BalloonEval *beval));
-extern void gui_mch_disable_beval_area __ARGS((BalloonEval *beval));
-extern BalloonEval *gui_mch_currently_showing_beval __ARGS((void));
-extern int get_beval_info __ARGS((BalloonEval *beval, int getword, win_T **winp, linenr_T *lnump, char_u **textp, int *colp));
-extern void gui_mch_post_balloon __ARGS((BalloonEval *beval, char_u *mesg));
-extern void gui_mch_unpost_balloon __ARGS((BalloonEval *beval));
+void general_beval_cb __ARGS((BalloonEval *beval, int state));
+BalloonEval *gui_mch_create_beval_area __ARGS((void *target, char_u *mesg, void (*mesgCB)(BalloonEval *, int), void *clientData));
+void gui_mch_destroy_beval_area __ARGS((BalloonEval *beval));
+void gui_mch_enable_beval_area __ARGS((BalloonEval *beval));
+void gui_mch_disable_beval_area __ARGS((BalloonEval *beval));
+BalloonEval *gui_mch_currently_showing_beval __ARGS((void));
+int get_beval_info __ARGS((BalloonEval *beval, int getword, win_T **winp, linenr_T *lnump, char_u **textp, int *colp));
+void gui_mch_post_balloon __ARGS((BalloonEval *beval, char_u *mesg));
+void gui_mch_unpost_balloon __ARGS((BalloonEval *beval));
 /* vim: set ft=c : */
diff --git a/src/proto/gui_motif.pro b/src/proto/gui_motif.pro
index 57717b90e..3e08ec9db 100644
--- a/src/proto/gui_motif.pro
+++ b/src/proto/gui_motif.pro
@@ -1,46 +1,46 @@
 /* gui_motif.c */
-extern void gui_x11_create_widgets __ARGS((void));
-extern void gui_x11_destroy_widgets __ARGS((void));
-extern void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h));
-extern void gui_x11_set_back_color __ARGS((void));
-extern void manage_centered __ARGS((Widget dialog_child));
-extern XmFontList gui_motif_create_fontlist __ARGS((XFontStruct *font));
-extern XmFontList gui_motif_fontset2fontlist __ARGS((XFontSet *fontset));
-extern void gui_mch_enable_menu __ARGS((int flag));
-extern void gui_motif_set_mnemonics __ARGS((int enable));
-extern void gui_mch_add_menu __ARGS((vimmenu_T *menu, int idx));
-extern void gui_mch_toggle_tearoffs __ARGS((int enable));
-extern int gui_mch_text_area_extra_height __ARGS((void));
-extern void gui_mch_compute_menu_height __ARGS((Widget id));
-extern void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
-extern void gui_motif_update_mousemodel __ARGS((vimmenu_T *menu));
-extern void gui_mch_new_menu_colors __ARGS((void));
-extern void gui_mch_new_menu_font __ARGS((void));
-extern void gui_mch_new_tooltip_font __ARGS((void));
-extern void gui_mch_new_tooltip_colors __ARGS((void));
-extern void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
-extern void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
-extern void gui_mch_def_colors __ARGS((void));
-extern void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max));
-extern void gui_mch_set_scrollbar_pos __ARGS((scrollbar_T *sb, int x, int y, int w, int h));
-extern void gui_mch_enable_scrollbar __ARGS((scrollbar_T *sb, int flag));
-extern void gui_mch_create_scrollbar __ARGS((scrollbar_T *sb, int orient));
-extern void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
-extern void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
-extern Window gui_x11_get_wid __ARGS((void));
-extern char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
-extern int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield));
-extern void gui_mch_enable_footer __ARGS((int showit));
-extern void gui_mch_set_footer __ARGS((char_u *s));
-extern void gui_mch_show_toolbar __ARGS((int showit));
-extern int gui_mch_compute_toolbar_height __ARGS((void));
-extern void motif_get_toolbar_colors __ARGS((Pixel *bgp, Pixel *fgp, Pixel *bsp, Pixel *tsp, Pixel *hsp));
-extern void gui_mch_show_tabline __ARGS((int showit));
-extern int gui_mch_showing_tabline __ARGS((void));
-extern void gui_mch_update_tabline __ARGS((void));
-extern void gui_mch_set_curtab __ARGS((int nr));
-extern void gui_motif_menu_fontlist __ARGS((Widget id));
-extern void gui_mch_find_dialog __ARGS((exarg_T *eap));
-extern void gui_mch_replace_dialog __ARGS((exarg_T *eap));
-extern void gui_motif_synch_fonts __ARGS((void));
+void gui_x11_create_widgets __ARGS((void));
+void gui_x11_destroy_widgets __ARGS((void));
+void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h));
+void gui_x11_set_back_color __ARGS((void));
+void manage_centered __ARGS((Widget dialog_child));
+XmFontList gui_motif_create_fontlist __ARGS((XFontStruct *font));
+XmFontList gui_motif_fontset2fontlist __ARGS((XFontSet *fontset));
+void gui_mch_enable_menu __ARGS((int flag));
+void gui_motif_set_mnemonics __ARGS((int enable));
+void gui_mch_add_menu __ARGS((vimmenu_T *menu, int idx));
+void gui_mch_toggle_tearoffs __ARGS((int enable));
+int gui_mch_text_area_extra_height __ARGS((void));
+void gui_mch_compute_menu_height __ARGS((Widget id));
+void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
+void gui_motif_update_mousemodel __ARGS((vimmenu_T *menu));
+void gui_mch_new_menu_colors __ARGS((void));
+void gui_mch_new_menu_font __ARGS((void));
+void gui_mch_new_tooltip_font __ARGS((void));
+void gui_mch_new_tooltip_colors __ARGS((void));
+void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
+void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
+void gui_mch_def_colors __ARGS((void));
+void gui_mch_set_scrollbar_thumb __ARGS((scrollbar_T *sb, long val, long size, long max));
+void gui_mch_set_scrollbar_pos __ARGS((scrollbar_T *sb, int x, int y, int w, int h));
+void gui_mch_enable_scrollbar __ARGS((scrollbar_T *sb, int flag));
+void gui_mch_create_scrollbar __ARGS((scrollbar_T *sb, int orient));
+void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
+void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
+Window gui_x11_get_wid __ARGS((void));
+char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield));
+void gui_mch_enable_footer __ARGS((int showit));
+void gui_mch_set_footer __ARGS((char_u *s));
+void gui_mch_show_toolbar __ARGS((int showit));
+int gui_mch_compute_toolbar_height __ARGS((void));
+void motif_get_toolbar_colors __ARGS((Pixel *bgp, Pixel *fgp, Pixel *bsp, Pixel *tsp, Pixel *hsp));
+void gui_mch_show_tabline __ARGS((int showit));
+int gui_mch_showing_tabline __ARGS((void));
+void gui_mch_update_tabline __ARGS((void));
+void gui_mch_set_curtab __ARGS((int nr));
+void gui_motif_menu_fontlist __ARGS((Widget id));
+void gui_mch_find_dialog __ARGS((exarg_T *eap));
+void gui_mch_replace_dialog __ARGS((exarg_T *eap));
+void gui_motif_synch_fonts __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/proto/gui_x11.pro b/src/proto/gui_x11.pro
index f8abb070f..d0aec94d6 100644
--- a/src/proto/gui_x11.pro
+++ b/src/proto/gui_x11.pro
@@ -1,70 +1,70 @@
 /* gui_x11.c */
-extern void gui_x11_key_hit_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum));
-extern void gui_mch_prepare __ARGS((int *argc, char **argv));
-extern int gui_mch_init_check __ARGS((void));
-extern int gui_mch_init __ARGS((void));
-extern void gui_mch_uninit __ARGS((void));
-extern void gui_mch_new_colors __ARGS((void));
-extern int gui_mch_open __ARGS((void));
-extern void gui_init_tooltip_font __ARGS((void));
-extern void gui_init_menu_font __ARGS((void));
-extern void gui_mch_exit __ARGS((int rc));
-extern int gui_mch_get_winpos __ARGS((int *x, int *y));
-extern void gui_mch_set_winpos __ARGS((int x, int y));
-extern void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
-extern void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
-extern int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset));
-extern GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing));
-extern char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name));
-extern int gui_mch_adjust_charheight __ARGS((void));
-extern void gui_mch_set_font __ARGS((GuiFont font));
-extern void gui_mch_set_fontset __ARGS((GuiFontset fontset));
-extern void gui_mch_free_font __ARGS((GuiFont font));
-extern void gui_mch_free_fontset __ARGS((GuiFontset fontset));
-extern GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int giveErrorIfMissing, int fixed_width));
-extern int fontset_height __ARGS((XFontSet fs));
-extern int fontset_height2 __ARGS((XFontSet fs));
-extern guicolor_T gui_mch_get_color __ARGS((char_u *reqname));
-extern void gui_mch_set_fg_color __ARGS((guicolor_T color));
-extern void gui_mch_set_bg_color __ARGS((guicolor_T color));
-extern void gui_mch_set_sp_color __ARGS((guicolor_T color));
-extern void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags));
-extern int gui_mch_haskey __ARGS((char_u *name));
-extern int gui_get_x11_windis __ARGS((Window *win, Display **dis));
-extern void gui_mch_beep __ARGS((void));
-extern void gui_mch_flash __ARGS((int msec));
-extern void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc));
-extern void gui_mch_iconify __ARGS((void));
-extern void gui_mch_set_foreground __ARGS((void));
-extern void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color));
-extern void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color));
-extern void gui_mch_update __ARGS((void));
-extern int gui_mch_wait_for_chars __ARGS((long wtime));
-extern void gui_mch_flush __ARGS((void));
-extern void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2));
-extern void gui_mch_clear_all __ARGS((void));
-extern void gui_mch_delete_lines __ARGS((int row, int num_lines));
-extern void gui_mch_insert_lines __ARGS((int row, int num_lines));
-extern void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
-extern int clip_mch_own_selection __ARGS((VimClipboard *cbd));
-extern void clip_mch_request_selection __ARGS((VimClipboard *cbd));
-extern void clip_mch_set_selection __ARGS((VimClipboard *cbd));
-extern void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
-extern void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden));
-extern void gui_mch_draw_menubar __ARGS((void));
-extern void gui_x11_menu_cb __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
-extern void gui_mch_set_blinking __ARGS((long waittime, long on, long off));
-extern void gui_mch_stop_blink __ARGS((void));
-extern void gui_mch_start_blink __ARGS((void));
-extern long_u gui_mch_get_rgb __ARGS((guicolor_T pixel));
-extern void gui_x11_callbacks __ARGS((Widget textArea, Widget vimForm));
-extern void gui_mch_getmouse __ARGS((int *x, int *y));
-extern void gui_mch_setmouse __ARGS((int x, int y));
-extern XButtonPressedEvent *gui_x11_get_last_mouse_event __ARGS((void));
-extern void gui_mch_drawsign __ARGS((int row, int col, int typenr));
-extern void *gui_mch_register_sign __ARGS((char_u *signfile));
-extern void gui_mch_destroy_sign __ARGS((void *sign));
-extern void gui_mch_mousehide __ARGS((int hide));
-extern void mch_set_mouse_shape __ARGS((int shape));
-extern void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu));
+void gui_x11_key_hit_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum));
+void gui_mch_prepare __ARGS((int *argc, char **argv));
+int gui_mch_init_check __ARGS((void));
+int gui_mch_init __ARGS((void));
+void gui_mch_uninit __ARGS((void));
+void gui_mch_new_colors __ARGS((void));
+int gui_mch_open __ARGS((void));
+void gui_init_tooltip_font __ARGS((void));
+void gui_init_menu_font __ARGS((void));
+void gui_mch_exit __ARGS((int rc));
+int gui_mch_get_winpos __ARGS((int *x, int *y));
+void gui_mch_set_winpos __ARGS((int x, int y));
+void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
+void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
+int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset));
+GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing));
+char_u *gui_mch_get_fontname __ARGS((GuiFont font, char_u *name));
+int gui_mch_adjust_charheight __ARGS((void));
+void gui_mch_set_font __ARGS((GuiFont font));
+void gui_mch_set_fontset __ARGS((GuiFontset fontset));
+void gui_mch_free_font __ARGS((GuiFont font));
+void gui_mch_free_fontset __ARGS((GuiFontset fontset));
+GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int giveErrorIfMissing, int fixed_width));
+int fontset_height __ARGS((XFontSet fs));
+int fontset_height2 __ARGS((XFontSet fs));
+guicolor_T gui_mch_get_color __ARGS((char_u *reqname));
+void gui_mch_set_fg_color __ARGS((guicolor_T color));
+void gui_mch_set_bg_color __ARGS((guicolor_T color));
+void gui_mch_set_sp_color __ARGS((guicolor_T color));
+void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags));
+int gui_mch_haskey __ARGS((char_u *name));
+int gui_get_x11_windis __ARGS((Window *win, Display **dis));
+void gui_mch_beep __ARGS((void));
+void gui_mch_flash __ARGS((int msec));
+void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc));
+void gui_mch_iconify __ARGS((void));
+void gui_mch_set_foreground __ARGS((void));
+void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color));
+void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color));
+void gui_mch_update __ARGS((void));
+int gui_mch_wait_for_chars __ARGS((long wtime));
+void gui_mch_flush __ARGS((void));
+void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2));
+void gui_mch_clear_all __ARGS((void));
+void gui_mch_delete_lines __ARGS((int row, int num_lines));
+void gui_mch_insert_lines __ARGS((int row, int num_lines));
+void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
+int clip_mch_own_selection __ARGS((VimClipboard *cbd));
+void clip_mch_request_selection __ARGS((VimClipboard *cbd));
+void clip_mch_set_selection __ARGS((VimClipboard *cbd));
+void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
+void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden));
+void gui_mch_draw_menubar __ARGS((void));
+void gui_x11_menu_cb __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
+void gui_mch_set_blinking __ARGS((long waittime, long on, long off));
+void gui_mch_stop_blink __ARGS((void));
+void gui_mch_start_blink __ARGS((void));
+long_u gui_mch_get_rgb __ARGS((guicolor_T pixel));
+void gui_x11_callbacks __ARGS((Widget textArea, Widget vimForm));
+void gui_mch_getmouse __ARGS((int *x, int *y));
+void gui_mch_setmouse __ARGS((int x, int y));
+XButtonPressedEvent *gui_x11_get_last_mouse_event __ARGS((void));
+void gui_mch_drawsign __ARGS((int row, int col, int typenr));
+void *gui_mch_register_sign __ARGS((char_u *signfile));
+void gui_mch_destroy_sign __ARGS((void *sign));
+void gui_mch_mousehide __ARGS((int hide));
+void mch_set_mouse_shape __ARGS((int shape));
+void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu));
 /* vim: set ft=c : */
diff --git a/src/proto/hangulin.pro b/src/proto/hangulin.pro
index 350b1cbc5..adfde142f 100644
--- a/src/proto/hangulin.pro
+++ b/src/proto/hangulin.pro
@@ -1,9 +1,9 @@
 /* hangulin.c */
-extern int hangul_input_state_get __ARGS((void));
-extern void hangul_input_state_set __ARGS((int state));
-extern int im_get_status __ARGS((void));
-extern void hangul_input_state_toggle __ARGS((void));
-extern void hangul_keyboard_set __ARGS((void));
-extern int hangul_input_process __ARGS((char_u *s, int len));
-extern void hangul_input_clear __ARGS((void));
+int hangul_input_state_get __ARGS((void));
+void hangul_input_state_set __ARGS((int state));
+int im_get_status __ARGS((void));
+void hangul_input_state_toggle __ARGS((void));
+void hangul_keyboard_set __ARGS((void));
+int hangul_input_process __ARGS((char_u *s, int len));
+void hangul_input_clear __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/proto/if_perl.pro b/src/proto/if_perl.pro
index 91dab6da3..fe0301b0b 100644
--- a/src/proto/if_perl.pro
+++ b/src/proto/if_perl.pro
@@ -1,8 +1,8 @@
 /* auto/if_perl.c */
-extern int perl_enabled __ARGS((int verbose));
-extern void perl_end __ARGS((void));
-extern void msg_split __ARGS((char_u *s, int attr));
-extern void perl_win_free __ARGS((win_T *wp));
-extern void perl_buf_free __ARGS((buf_T *bp));
-extern void ex_perl __ARGS((exarg_T *eap));
-extern void ex_perldo __ARGS((exarg_T *eap));
+int perl_enabled __ARGS((int verbose));
+void perl_end __ARGS((void));
+void msg_split __ARGS((char_u *s, int attr));
+void perl_win_free __ARGS((win_T *wp));
+void perl_buf_free __ARGS((buf_T *bp));
+void ex_perl __ARGS((exarg_T *eap));
+void ex_perldo __ARGS((exarg_T *eap));
diff --git a/src/proto/if_python.pro b/src/proto/if_python.pro
index 09c4ab751..793b6eeb5 100644
--- a/src/proto/if_python.pro
+++ b/src/proto/if_python.pro
@@ -1,8 +1,8 @@
 /* if_python.c */
-extern int python_enabled __ARGS((int verbose));
-extern void python_end __ARGS((void));
-extern void ex_python __ARGS((exarg_T *eap));
-extern void ex_pyfile __ARGS((exarg_T *eap));
-extern void python_buffer_free __ARGS((buf_T *buf));
-extern void python_window_free __ARGS((win_T *win));
+int python_enabled __ARGS((int verbose));
+void python_end __ARGS((void));
+void ex_python __ARGS((exarg_T *eap));
+void ex_pyfile __ARGS((exarg_T *eap));
+void python_buffer_free __ARGS((buf_T *buf));
+void python_window_free __ARGS((win_T *win));
 /* vim: set ft=c : */
diff --git a/src/proto/if_ruby.pro b/src/proto/if_ruby.pro
index 352f155e9..7dedb225c 100644
--- a/src/proto/if_ruby.pro
+++ b/src/proto/if_ruby.pro
@@ -1,9 +1,9 @@
 /* if_ruby.c */
-extern int ruby_enabled __ARGS((int verbose));
-extern void ruby_end __ARGS((void));
-extern void ex_ruby __ARGS((exarg_T *eap));
-extern void ex_rubydo __ARGS((exarg_T *eap));
-extern void ex_rubyfile __ARGS((exarg_T *eap));
-extern void ruby_buffer_free __ARGS((buf_T *buf));
-extern void ruby_window_free __ARGS((win_T *win));
+int ruby_enabled __ARGS((int verbose));
+void ruby_end __ARGS((void));
+void ex_ruby __ARGS((exarg_T *eap));
+void ex_rubydo __ARGS((exarg_T *eap));
+void ex_rubyfile __ARGS((exarg_T *eap));
+void ruby_buffer_free __ARGS((buf_T *buf));
+void ruby_window_free __ARGS((win_T *win));
 /* vim: set ft=c : */
diff --git a/src/proto/if_xcmdsrv.pro b/src/proto/if_xcmdsrv.pro
index ebb45f18b..dd6a12084 100644
--- a/src/proto/if_xcmdsrv.pro
+++ b/src/proto/if_xcmdsrv.pro
@@ -1,11 +1,11 @@
 /* if_xcmdsrv.c */
-extern int serverRegisterName __ARGS((Display *dpy, char_u *name));
-extern void serverChangeRegisteredWindow __ARGS((Display *dpy, Window newwin));
-extern int serverSendToVim __ARGS((Display *dpy, char_u *name, char_u *cmd, char_u **result, Window *server, int asExpr, int localLoop, int silent));
-extern char_u *serverGetVimNames __ARGS((Display *dpy));
-extern Window serverStrToWin __ARGS((char_u *str));
-extern int serverSendReply __ARGS((char_u *name, char_u *str));
-extern int serverReadReply __ARGS((Display *dpy, Window win, char_u **str, int localLoop));
-extern int serverPeekReply __ARGS((Display *dpy, Window win, char_u **str));
-extern void serverEventProc __ARGS((Display *dpy, XEvent *eventPtr));
+int serverRegisterName __ARGS((Display *dpy, char_u *name));
+void serverChangeRegisteredWindow __ARGS((Display *dpy, Window newwin));
+int serverSendToVim __ARGS((Display *dpy, char_u *name, char_u *cmd, char_u **result, Window *server, int asExpr, int localLoop, int silent));
+char_u *serverGetVimNames __ARGS((Display *dpy));
+Window serverStrToWin __ARGS((char_u *str));
+int serverSendReply __ARGS((char_u *name, char_u *str));
+int serverReadReply __ARGS((Display *dpy, Window win, char_u **str, int localLoop));
+int serverPeekReply __ARGS((Display *dpy, Window win, char_u **str));
+void serverEventProc __ARGS((Display *dpy, XEvent *eventPtr));
 /* vim: set ft=c : */
diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro
index 020b60fc4..16a36c893 100644
--- a/src/proto/mbyte.pro
+++ b/src/proto/mbyte.pro
@@ -1,91 +1,91 @@
 /* mbyte.c */
-extern int enc_canon_props __ARGS((char_u *name));
-extern char_u *mb_init __ARGS((void));
-extern int bomb_size __ARGS((void));
-extern int mb_get_class __ARGS((char_u *p));
-extern int dbcs_class __ARGS((unsigned lead, unsigned trail));
-extern int latin_char2len __ARGS((int c));
-extern int latin_char2bytes __ARGS((int c, char_u *buf));
-extern int latin_ptr2len __ARGS((char_u *p));
-extern int utf_char2cells __ARGS((int c));
-extern int latin_ptr2cells __ARGS((char_u *p));
-extern int utf_ptr2cells __ARGS((char_u *p));
-extern int dbcs_ptr2cells __ARGS((char_u *p));
-extern int latin_char2cells __ARGS((int c));
-extern int latin_off2cells __ARGS((unsigned off));
-extern int dbcs_off2cells __ARGS((unsigned off));
-extern int utf_off2cells __ARGS((unsigned off));
-extern int latin_ptr2char __ARGS((char_u *p));
-extern int utf_ptr2char __ARGS((char_u *p));
-extern int mb_ptr2char_adv __ARGS((char_u **pp));
-extern int mb_cptr2char_adv __ARGS((char_u **pp));
-extern int arabic_combine __ARGS((int one, int two));
-extern int arabic_maycombine __ARGS((int two));
-extern int utf_composinglike __ARGS((char_u *p1, char_u *p2));
-extern int utfc_ptr2char __ARGS((char_u *p, int *pcc));
-extern int utfc_ptr2char_len __ARGS((char_u *p, int *pcc, int maxlen));
-extern int utfc_char2bytes __ARGS((int off, char_u *buf));
-extern int utf_ptr2len __ARGS((char_u *p));
-extern int utf_byte2len __ARGS((int b));
-extern int utf_ptr2len_len __ARGS((char_u *p, int size));
-extern int utfc_ptr2len __ARGS((char_u *p));
-extern int utfc_ptr2len_len __ARGS((char_u *p, int size));
-extern int utf_char2len __ARGS((int c));
-extern int utf_char2bytes __ARGS((int c, char_u *buf));
-extern int utf_iscomposing __ARGS((int c));
-extern int utf_printable __ARGS((int c));
-extern int utf_class __ARGS((int c));
-extern int utf_fold __ARGS((int a));
-extern int utf_toupper __ARGS((int a));
-extern int utf_islower __ARGS((int a));
-extern int utf_tolower __ARGS((int a));
-extern int utf_isupper __ARGS((int a));
-extern int mb_strnicmp __ARGS((char_u *s1, char_u *s2, size_t nn));
-extern void show_utf8 __ARGS((void));
-extern int latin_head_off __ARGS((char_u *base, char_u *p));
-extern int dbcs_head_off __ARGS((char_u *base, char_u *p));
-extern int dbcs_screen_head_off __ARGS((char_u *base, char_u *p));
-extern int utf_head_off __ARGS((char_u *base, char_u *p));
-extern void mb_copy_char __ARGS((char_u **fp, char_u **tp));
-extern int mb_off_next __ARGS((char_u *base, char_u *p));
-extern int mb_tail_off __ARGS((char_u *base, char_u *p));
-extern void utf_find_illegal __ARGS((void));
-extern int utf_valid_string __ARGS((char_u *s, char_u *end));
-extern int dbcs_screen_tail_off __ARGS((char_u *base, char_u *p));
-extern void mb_adjust_cursor __ARGS((void));
-extern void mb_adjustpos __ARGS((pos_T *lp));
-extern char_u *mb_prevptr __ARGS((char_u *line, char_u *p));
-extern int mb_charlen __ARGS((char_u *str));
-extern int mb_charlen_len __ARGS((char_u *str, int len));
-extern char_u *mb_unescape __ARGS((char_u **pp));
-extern int mb_lefthalve __ARGS((int row, int col));
-extern int mb_fix_col __ARGS((int col, int row));
-extern char_u *enc_skip __ARGS((char_u *p));
-extern char_u *enc_canonize __ARGS((char_u *enc));
-extern char_u *enc_locale __ARGS((void));
-extern int encname2codepage __ARGS((char_u *name));
-extern void *my_iconv_open __ARGS((char_u *to, char_u *from));
-extern int iconv_enabled __ARGS((int verbose));
-extern void iconv_end __ARGS((void));
-extern int im_xim_isvalid_imactivate __ARGS((void));
-extern void im_set_active __ARGS((int active));
-extern void xim_set_focus __ARGS((int focus));
-extern void im_set_position __ARGS((int row, int col));
-extern void xim_set_preedit __ARGS((void));
-extern void xim_set_status_area __ARGS((void));
-extern void xim_init __ARGS((void));
-extern void xim_decide_input_style __ARGS((void));
-extern int im_get_feedback_attr __ARGS((int col));
-extern void xim_reset __ARGS((void));
-extern int xim_queue_key_press_event __ARGS((GdkEventKey *event, int down));
-extern void xim_init __ARGS((void));
-extern void im_shutdown __ARGS((void));
-extern int xim_get_status_area_height __ARGS((void));
-extern int im_get_status __ARGS((void));
-extern int im_is_preediting __ARGS((void));
-extern int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
-extern int convert_input __ARGS((char_u *ptr, int len, int maxlen));
-extern int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp));
-extern char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp));
-extern char_u *string_convert_ext __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp, int *unconvlenp));
+int enc_canon_props __ARGS((char_u *name));
+char_u *mb_init __ARGS((void));
+int bomb_size __ARGS((void));
+int mb_get_class __ARGS((char_u *p));
+int dbcs_class __ARGS((unsigned lead, unsigned trail));
+int latin_char2len __ARGS((int c));
+int latin_char2bytes __ARGS((int c, char_u *buf));
+int latin_ptr2len __ARGS((char_u *p));
+int utf_char2cells __ARGS((int c));
+int latin_ptr2cells __ARGS((char_u *p));
+int utf_ptr2cells __ARGS((char_u *p));
+int dbcs_ptr2cells __ARGS((char_u *p));
+int latin_char2cells __ARGS((int c));
+int latin_off2cells __ARGS((unsigned off));
+int dbcs_off2cells __ARGS((unsigned off));
+int utf_off2cells __ARGS((unsigned off));
+int latin_ptr2char __ARGS((char_u *p));
+int utf_ptr2char __ARGS((char_u *p));
+int mb_ptr2char_adv __ARGS((char_u **pp));
+int mb_cptr2char_adv __ARGS((char_u **pp));
+int arabic_combine __ARGS((int one, int two));
+int arabic_maycombine __ARGS((int two));
+int utf_composinglike __ARGS((char_u *p1, char_u *p2));
+int utfc_ptr2char __ARGS((char_u *p, int *pcc));
+int utfc_ptr2char_len __ARGS((char_u *p, int *pcc, int maxlen));
+int utfc_char2bytes __ARGS((int off, char_u *buf));
+int utf_ptr2len __ARGS((char_u *p));
+int utf_byte2len __ARGS((int b));
+int utf_ptr2len_len __ARGS((char_u *p, int size));
+int utfc_ptr2len __ARGS((char_u *p));
+int utfc_ptr2len_len __ARGS((char_u *p, int size));
+int utf_char2len __ARGS((int c));
+int utf_char2bytes __ARGS((int c, char_u *buf));
+int utf_iscomposing __ARGS((int c));
+int utf_printable __ARGS((int c));
+int utf_class __ARGS((int c));
+int utf_fold __ARGS((int a));
+int utf_toupper __ARGS((int a));
+int utf_islower __ARGS((int a));
+int utf_tolower __ARGS((int a));
+int utf_isupper __ARGS((int a));
+int mb_strnicmp __ARGS((char_u *s1, char_u *s2, size_t nn));
+void show_utf8 __ARGS((void));
+int latin_head_off __ARGS((char_u *base, char_u *p));
+int dbcs_head_off __ARGS((char_u *base, char_u *p));
+int dbcs_screen_head_off __ARGS((char_u *base, char_u *p));
+int utf_head_off __ARGS((char_u *base, char_u *p));
+void mb_copy_char __ARGS((char_u **fp, char_u **tp));
+int mb_off_next __ARGS((char_u *base, char_u *p));
+int mb_tail_off __ARGS((char_u *base, char_u *p));
+void utf_find_illegal __ARGS((void));
+int utf_valid_string __ARGS((char_u *s, char_u *end));
+int dbcs_screen_tail_off __ARGS((char_u *base, char_u *p));
+void mb_adjust_cursor __ARGS((void));
+void mb_adjustpos __ARGS((pos_T *lp));
+char_u *mb_prevptr __ARGS((char_u *line, char_u *p));
+int mb_charlen __ARGS((char_u *str));
+int mb_charlen_len __ARGS((char_u *str, int len));
+char_u *mb_unescape __ARGS((char_u **pp));
+int mb_lefthalve __ARGS((int row, int col));
+int mb_fix_col __ARGS((int col, int row));
+char_u *enc_skip __ARGS((char_u *p));
+char_u *enc_canonize __ARGS((char_u *enc));
+char_u *enc_locale __ARGS((void));
+int encname2codepage __ARGS((char_u *name));
+void *my_iconv_open __ARGS((char_u *to, char_u *from));
+int iconv_enabled __ARGS((int verbose));
+void iconv_end __ARGS((void));
+int im_xim_isvalid_imactivate __ARGS((void));
+void im_set_active __ARGS((int active));
+void xim_set_focus __ARGS((int focus));
+void im_set_position __ARGS((int row, int col));
+void xim_set_preedit __ARGS((void));
+void xim_set_status_area __ARGS((void));
+void xim_init __ARGS((void));
+void xim_decide_input_style __ARGS((void));
+int im_get_feedback_attr __ARGS((int col));
+void xim_reset __ARGS((void));
+int xim_queue_key_press_event __ARGS((GdkEventKey *event, int down));
+void xim_init __ARGS((void));
+void im_shutdown __ARGS((void));
+int xim_get_status_area_height __ARGS((void));
+int im_get_status __ARGS((void));
+int im_is_preediting __ARGS((void));
+int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
+int convert_input __ARGS((char_u *ptr, int len, int maxlen));
+int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp));
+char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp));
+char_u *string_convert_ext __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp, int *unconvlenp));
 /* vim: set ft=c : */
diff --git a/src/proto/memline.pro b/src/proto/memline.pro
index 88f0dac07..de75a7dcf 100644
--- a/src/proto/memline.pro
+++ b/src/proto/memline.pro
@@ -1,33 +1,33 @@
 /* memline.c */
-extern int ml_open __ARGS((buf_T *buf));
-extern void ml_setname __ARGS((buf_T *buf));
-extern void ml_open_files __ARGS((void));
-extern void ml_open_file __ARGS((buf_T *buf));
-extern void check_need_swap __ARGS((int newfile));
-extern void ml_close __ARGS((buf_T *buf, int del_file));
-extern void ml_close_all __ARGS((int del_file));
-extern void ml_close_notmod __ARGS((void));
-extern void ml_timestamp __ARGS((buf_T *buf));
-extern void ml_recover __ARGS((void));
-extern int recover_names __ARGS((char_u **fname, int list, int nr));
-extern void ml_sync_all __ARGS((int check_file, int check_char));
-extern void ml_preserve __ARGS((buf_T *buf, int message));
-extern char_u *ml_get __ARGS((linenr_T lnum));
-extern char_u *ml_get_pos __ARGS((pos_T *pos));
-extern char_u *ml_get_curline __ARGS((void));
-extern char_u *ml_get_cursor __ARGS((void));
-extern char_u *ml_get_buf __ARGS((buf_T *buf, linenr_T lnum, int will_change));
-extern int ml_line_alloced __ARGS((void));
-extern int ml_append __ARGS((linenr_T lnum, char_u *line, colnr_T len, int newfile));
-extern int ml_append_buf __ARGS((buf_T *buf, linenr_T lnum, char_u *line, colnr_T len, int newfile));
-extern int ml_replace __ARGS((linenr_T lnum, char_u *line, int copy));
-extern int ml_delete __ARGS((linenr_T lnum, int message));
-extern void ml_setmarked __ARGS((linenr_T lnum));
-extern linenr_T ml_firstmarked __ARGS((void));
-extern void ml_clearmarked __ARGS((void));
-extern char_u *makeswapname __ARGS((char_u *fname, char_u *ffname, buf_T *buf, char_u *dir_name));
-extern char_u *get_file_in_dir __ARGS((char_u *fname, char_u *dname));
-extern void ml_setflags __ARGS((buf_T *buf));
-extern long ml_find_line_or_offset __ARGS((buf_T *buf, linenr_T lnum, long *offp));
-extern void goto_byte __ARGS((long cnt));
+int ml_open __ARGS((buf_T *buf));
+void ml_setname __ARGS((buf_T *buf));
+void ml_open_files __ARGS((void));
+void ml_open_file __ARGS((buf_T *buf));
+void check_need_swap __ARGS((int newfile));
+void ml_close __ARGS((buf_T *buf, int del_file));
+void ml_close_all __ARGS((int del_file));
+void ml_close_notmod __ARGS((void));
+void ml_timestamp __ARGS((buf_T *buf));
+void ml_recover __ARGS((void));
+int recover_names __ARGS((char_u **fname, int list, int nr));
+void ml_sync_all __ARGS((int check_file, int check_char));
+void ml_preserve __ARGS((buf_T *buf, int message));
+char_u *ml_get __ARGS((linenr_T lnum));
+char_u *ml_get_pos __ARGS((pos_T *pos));
+char_u *ml_get_curline __ARGS((void));
+char_u *ml_get_cursor __ARGS((void));
+char_u *ml_get_buf __ARGS((buf_T *buf, linenr_T lnum, int will_change));
+int ml_line_alloced __ARGS((void));
+int ml_append __ARGS((linenr_T lnum, char_u *line, colnr_T len, int newfile));
+int ml_append_buf __ARGS((buf_T *buf, linenr_T lnum, char_u *line, colnr_T len, int newfile));
+int ml_replace __ARGS((linenr_T lnum, char_u *line, int copy));
+int ml_delete __ARGS((linenr_T lnum, int message));
+void ml_setmarked __ARGS((linenr_T lnum));
+linenr_T ml_firstmarked __ARGS((void));
+void ml_clearmarked __ARGS((void));
+char_u *makeswapname __ARGS((char_u *fname, char_u *ffname, buf_T *buf, char_u *dir_name));
+char_u *get_file_in_dir __ARGS((char_u *fname, char_u *dname));
+void ml_setflags __ARGS((buf_T *buf));
+long ml_find_line_or_offset __ARGS((buf_T *buf, linenr_T lnum, long *offp));
+void goto_byte __ARGS((long cnt));
 /* vim: set ft=c : */
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index 7d804b99d..e9bc32c55 100644
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -1,95 +1,95 @@
 /* misc1.c */
-extern int get_indent __ARGS((void));
-extern int get_indent_lnum __ARGS((linenr_T lnum));
-extern int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum));
-extern int get_indent_str __ARGS((char_u *ptr, int ts));
-extern int set_indent __ARGS((int size, int flags));
-extern int get_number_indent __ARGS((linenr_T lnum));
-extern int open_line __ARGS((int dir, int flags, int old_indent));
-extern int get_leader_len __ARGS((char_u *line, char_u **flags, int backward));
-extern int plines __ARGS((linenr_T lnum));
-extern int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
-extern int plines_nofill __ARGS((linenr_T lnum));
-extern int plines_win_nofill __ARGS((win_T *wp, linenr_T lnum, int winheight));
-extern int plines_win_nofold __ARGS((win_T *wp, linenr_T lnum));
-extern int plines_win_col __ARGS((win_T *wp, linenr_T lnum, long column));
-extern int plines_m_win __ARGS((win_T *wp, linenr_T first, linenr_T last));
-extern void ins_bytes __ARGS((char_u *p));
-extern void ins_bytes_len __ARGS((char_u *p, int len));
-extern void ins_char __ARGS((int c));
-extern void ins_char_bytes __ARGS((char_u *buf, int charlen));
-extern void ins_str __ARGS((char_u *s));
-extern int del_char __ARGS((int fixpos));
-extern int del_chars __ARGS((long count, int fixpos));
-extern int del_bytes __ARGS((long count, int fixpos_arg, int use_delcombine));
-extern int truncate_line __ARGS((int fixpos));
-extern void del_lines __ARGS((long nlines, int undo));
-extern int gchar_pos __ARGS((pos_T *pos));
-extern int gchar_cursor __ARGS((void));
-extern void pchar_cursor __ARGS((int c));
-extern int inindent __ARGS((int extra));
-extern char_u *skip_to_option_part __ARGS((char_u *p));
-extern void changed __ARGS((void));
-extern void changed_bytes __ARGS((linenr_T lnum, colnr_T col));
-extern void appended_lines __ARGS((linenr_T lnum, long count));
-extern void appended_lines_mark __ARGS((linenr_T lnum, long count));
-extern void deleted_lines __ARGS((linenr_T lnum, long count));
-extern void deleted_lines_mark __ARGS((linenr_T lnum, long count));
-extern void changed_lines __ARGS((linenr_T lnum, colnr_T col, linenr_T lnume, long xtra));
-extern void unchanged __ARGS((buf_T *buf, int ff));
-extern void check_status __ARGS((buf_T *buf));
-extern void change_warning __ARGS((int col));
-extern int ask_yesno __ARGS((char_u *str, int direct));
-extern int get_keystroke __ARGS((void));
-extern int get_number __ARGS((int colon, int *mouse_used));
-extern int prompt_for_number __ARGS((int *mouse_used));
-extern void msgmore __ARGS((long n));
-extern void beep_flush __ARGS((void));
-extern void vim_beep __ARGS((void));
-extern void init_homedir __ARGS((void));
-extern void free_homedir __ARGS((void));
-extern void expand_env __ARGS((char_u *src, char_u *dst, int dstlen));
-extern void expand_env_esc __ARGS((char_u *srcp, char_u *dst, int dstlen, int esc, char_u *startstr));
-extern char_u *vim_getenv __ARGS((char_u *name, int *mustfree));
-extern char_u *expand_env_save __ARGS((char_u *src));
-extern void vim_setenv __ARGS((char_u *name, char_u *val));
-extern char_u *get_env_name __ARGS((expand_T *xp, int idx));
-extern void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
-extern char_u *home_replace_save __ARGS((buf_T *buf, char_u *src));
-extern int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname));
-extern char_u *gettail __ARGS((char_u *fname));
-extern char_u *gettail_sep __ARGS((char_u *fname));
-extern char_u *getnextcomp __ARGS((char_u *fname));
-extern char_u *get_past_head __ARGS((char_u *path));
-extern int vim_ispathsep __ARGS((int c));
-extern int vim_ispathlistsep __ARGS((int c));
-extern void shorten_dir __ARGS((char_u *str));
-extern int dir_of_file_exists __ARGS((char_u *fname));
-extern int vim_fnamecmp __ARGS((char_u *x, char_u *y));
-extern int vim_fnamencmp __ARGS((char_u *x, char_u *y, size_t len));
-extern char_u *concat_fnames __ARGS((char_u *fname1, char_u *fname2, int sep));
-extern char_u *concat_str __ARGS((char_u *str1, char_u *str2));
-extern void add_pathsep __ARGS((char_u *p));
-extern char_u *FullName_save __ARGS((char_u *fname, int force));
-extern pos_T *find_start_comment __ARGS((int ind_maxcomment));
-extern void do_c_expr_indent __ARGS((void));
-extern int cin_islabel __ARGS((int ind_maxcomment));
-extern int cin_iscase __ARGS((char_u *s));
-extern int cin_isscopedecl __ARGS((char_u *s));
-extern int get_c_indent __ARGS((void));
-extern int get_expr_indent __ARGS((void));
-extern int get_lisp_indent __ARGS((void));
-extern void prepare_to_exit __ARGS((void));
-extern void preserve_exit __ARGS((void));
-extern int vim_fexists __ARGS((char_u *fname));
-extern void line_breakcheck __ARGS((void));
-extern void fast_breakcheck __ARGS((void));
-extern int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
-extern int match_suffix __ARGS((char_u *fname));
-extern int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
-extern int gen_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
-extern void addfile __ARGS((garray_T *gap, char_u *f, int flags));
-extern char_u *get_cmd_output __ARGS((char_u *cmd, char_u *infile, int flags));
-extern void FreeWild __ARGS((int count, char_u **files));
-extern int goto_im __ARGS((void));
+int get_indent __ARGS((void));
+int get_indent_lnum __ARGS((linenr_T lnum));
+int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum));
+int get_indent_str __ARGS((char_u *ptr, int ts));
+int set_indent __ARGS((int size, int flags));
+int get_number_indent __ARGS((linenr_T lnum));
+int open_line __ARGS((int dir, int flags, int old_indent));
+int get_leader_len __ARGS((char_u *line, char_u **flags, int backward));
+int plines __ARGS((linenr_T lnum));
+int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
+int plines_nofill __ARGS((linenr_T lnum));
+int plines_win_nofill __ARGS((win_T *wp, linenr_T lnum, int winheight));
+int plines_win_nofold __ARGS((win_T *wp, linenr_T lnum));
+int plines_win_col __ARGS((win_T *wp, linenr_T lnum, long column));
+int plines_m_win __ARGS((win_T *wp, linenr_T first, linenr_T last));
+void ins_bytes __ARGS((char_u *p));
+void ins_bytes_len __ARGS((char_u *p, int len));
+void ins_char __ARGS((int c));
+void ins_char_bytes __ARGS((char_u *buf, int charlen));
+void ins_str __ARGS((char_u *s));
+int del_char __ARGS((int fixpos));
+int del_chars __ARGS((long count, int fixpos));
+int del_bytes __ARGS((long count, int fixpos_arg, int use_delcombine));
+int truncate_line __ARGS((int fixpos));
+void del_lines __ARGS((long nlines, int undo));
+int gchar_pos __ARGS((pos_T *pos));
+int gchar_cursor __ARGS((void));
+void pchar_cursor __ARGS((int c));
+int inindent __ARGS((int extra));
+char_u *skip_to_option_part __ARGS((char_u *p));
+void changed __ARGS((void));
+void changed_bytes __ARGS((linenr_T lnum, colnr_T col));
+void appended_lines __ARGS((linenr_T lnum, long count));
+void appended_lines_mark __ARGS((linenr_T lnum, long count));
+void deleted_lines __ARGS((linenr_T lnum, long count));
+void deleted_lines_mark __ARGS((linenr_T lnum, long count));
+void changed_lines __ARGS((linenr_T lnum, colnr_T col, linenr_T lnume, long xtra));
+void unchanged __ARGS((buf_T *buf, int ff));
+void check_status __ARGS((buf_T *buf));
+void change_warning __ARGS((int col));
+int ask_yesno __ARGS((char_u *str, int direct));
+int get_keystroke __ARGS((void));
+int get_number __ARGS((int colon, int *mouse_used));
+int prompt_for_number __ARGS((int *mouse_used));
+void msgmore __ARGS((long n));
+void beep_flush __ARGS((void));
+void vim_beep __ARGS((void));
+void init_homedir __ARGS((void));
+void free_homedir __ARGS((void));
+void expand_env __ARGS((char_u *src, char_u *dst, int dstlen));
+void expand_env_esc __ARGS((char_u *srcp, char_u *dst, int dstlen, int esc, char_u *startstr));
+char_u *vim_getenv __ARGS((char_u *name, int *mustfree));
+char_u *expand_env_save __ARGS((char_u *src));
+void vim_setenv __ARGS((char_u *name, char_u *val));
+char_u *get_env_name __ARGS((expand_T *xp, int idx));
+void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
+char_u *home_replace_save __ARGS((buf_T *buf, char_u *src));
+int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname));
+char_u *gettail __ARGS((char_u *fname));
+char_u *gettail_sep __ARGS((char_u *fname));
+char_u *getnextcomp __ARGS((char_u *fname));
+char_u *get_past_head __ARGS((char_u *path));
+int vim_ispathsep __ARGS((int c));
+int vim_ispathlistsep __ARGS((int c));
+void shorten_dir __ARGS((char_u *str));
+int dir_of_file_exists __ARGS((char_u *fname));
+int vim_fnamecmp __ARGS((char_u *x, char_u *y));
+int vim_fnamencmp __ARGS((char_u *x, char_u *y, size_t len));
+char_u *concat_fnames __ARGS((char_u *fname1, char_u *fname2, int sep));
+char_u *concat_str __ARGS((char_u *str1, char_u *str2));
+void add_pathsep __ARGS((char_u *p));
+char_u *FullName_save __ARGS((char_u *fname, int force));
+pos_T *find_start_comment __ARGS((int ind_maxcomment));
+void do_c_expr_indent __ARGS((void));
+int cin_islabel __ARGS((int ind_maxcomment));
+int cin_iscase __ARGS((char_u *s));
+int cin_isscopedecl __ARGS((char_u *s));
+int get_c_indent __ARGS((void));
+int get_expr_indent __ARGS((void));
+int get_lisp_indent __ARGS((void));
+void prepare_to_exit __ARGS((void));
+void preserve_exit __ARGS((void));
+int vim_fexists __ARGS((char_u *fname));
+void line_breakcheck __ARGS((void));
+void fast_breakcheck __ARGS((void));
+int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
+int match_suffix __ARGS((char_u *fname));
+int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
+int gen_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
+void addfile __ARGS((garray_T *gap, char_u *f, int flags));
+char_u *get_cmd_output __ARGS((char_u *cmd, char_u *infile, int flags));
+void FreeWild __ARGS((int count, char_u **files));
+int goto_im __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/proto/move.pro b/src/proto/move.pro
index 26f3b65f8..de51aa240 100644
--- a/src/proto/move.pro
+++ b/src/proto/move.pro
@@ -1,40 +1,40 @@
 /* move.c */
-extern void update_topline_redraw __ARGS((void));
-extern void update_topline __ARGS((void));
-extern void update_curswant __ARGS((void));
-extern void check_cursor_moved __ARGS((win_T *wp));
-extern void changed_window_setting __ARGS((void));
-extern void changed_window_setting_win __ARGS((win_T *wp));
-extern void set_topline __ARGS((win_T *wp, linenr_T lnum));
-extern void changed_cline_bef_curs __ARGS((void));
-extern void changed_cline_bef_curs_win __ARGS((win_T *wp));
-extern void changed_line_abv_curs __ARGS((void));
-extern void changed_line_abv_curs_win __ARGS((win_T *wp));
-extern void validate_botline __ARGS((void));
-extern void invalidate_botline __ARGS((void));
-extern void invalidate_botline_win __ARGS((win_T *wp));
-extern void approximate_botline_win __ARGS((win_T *wp));
-extern int cursor_valid __ARGS((void));
-extern void validate_cursor __ARGS((void));
-extern void validate_cline_row __ARGS((void));
-extern void validate_virtcol __ARGS((void));
-extern void validate_virtcol_win __ARGS((win_T *wp));
-extern void validate_cursor_col __ARGS((void));
-extern int win_col_off __ARGS((win_T *wp));
-extern int curwin_col_off __ARGS((void));
-extern int win_col_off2 __ARGS((win_T *wp));
-extern int curwin_col_off2 __ARGS((void));
-extern void curs_columns __ARGS((int scroll));
-extern void scrolldown __ARGS((long line_count, int byfold));
-extern void scrollup __ARGS((long line_count, int byfold));
-extern void check_topfill __ARGS((win_T *wp, int down));
-extern void scrolldown_clamp __ARGS((void));
-extern void scrollup_clamp __ARGS((void));
-extern void scroll_cursor_top __ARGS((int min_scroll, int always));
-extern void set_empty_rows __ARGS((win_T *wp, int used));
-extern void scroll_cursor_bot __ARGS((int min_scroll, int set_topbot));
-extern void scroll_cursor_halfway __ARGS((int atend));
-extern void cursor_correct __ARGS((void));
-extern int onepage __ARGS((int dir, long count));
-extern void halfpage __ARGS((int flag, linenr_T Prenum));
+void update_topline_redraw __ARGS((void));
+void update_topline __ARGS((void));
+void update_curswant __ARGS((void));
+void check_cursor_moved __ARGS((win_T *wp));
+void changed_window_setting __ARGS((void));
+void changed_window_setting_win __ARGS((win_T *wp));
+void set_topline __ARGS((win_T *wp, linenr_T lnum));
+void changed_cline_bef_curs __ARGS((void));
+void changed_cline_bef_curs_win __ARGS((win_T *wp));
+void changed_line_abv_curs __ARGS((void));
+void changed_line_abv_curs_win __ARGS((win_T *wp));
+void validate_botline __ARGS((void));
+void invalidate_botline __ARGS((void));
+void invalidate_botline_win __ARGS((win_T *wp));
+void approximate_botline_win __ARGS((win_T *wp));
+int cursor_valid __ARGS((void));
+void validate_cursor __ARGS((void));
+void validate_cline_row __ARGS((void));
+void validate_virtcol __ARGS((void));
+void validate_virtcol_win __ARGS((win_T *wp));
+void validate_cursor_col __ARGS((void));
+int win_col_off __ARGS((win_T *wp));
+int curwin_col_off __ARGS((void));
+int win_col_off2 __ARGS((win_T *wp));
+int curwin_col_off2 __ARGS((void));
+void curs_columns __ARGS((int scroll));
+void scrolldown __ARGS((long line_count, int byfold));
+void scrollup __ARGS((long line_count, int byfold));
+void check_topfill __ARGS((win_T *wp, int down));
+void scrolldown_clamp __ARGS((void));
+void scrollup_clamp __ARGS((void));
+void scroll_cursor_top __ARGS((int min_scroll, int always));
+void set_empty_rows __ARGS((win_T *wp, int used));
+void scroll_cursor_bot __ARGS((int min_scroll, int set_topbot));
+void scroll_cursor_halfway __ARGS((int atend));
+void cursor_correct __ARGS((void));
+int onepage __ARGS((int dir, long count));
+void halfpage __ARGS((int flag, linenr_T Prenum));
 /* vim: set ft=c : */
diff --git a/src/proto/os_msdos.pro b/src/proto/os_msdos.pro
index 5cccbd6eb..a867f3d1c 100644
--- a/src/proto/os_msdos.pro
+++ b/src/proto/os_msdos.pro
@@ -1,48 +1,48 @@
 /* os_msdos.c */
-extern void mch_set_normal_colors __ARGS((void));
-extern void mch_update_cursor __ARGS((void));
-extern long_u mch_avail_mem __ARGS((int special));
-extern void mch_delay __ARGS((long msec, int ignoreinput));
-extern void mch_write __ARGS((char_u *s, int len));
-extern int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
-extern int mch_char_avail __ARGS((void));
-extern void mch_suspend __ARGS((void));
-extern void mch_init __ARGS((void));
-extern int mch_check_win __ARGS((int argc, char **argv));
-extern int mch_input_isatty __ARGS((void));
-extern void fname_case __ARGS((char_u *name, int len));
-extern long mch_get_pid __ARGS((void));
-extern int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
-extern void slash_adjust __ARGS((char_u *p));
-extern int mch_isFullName __ARGS((char_u *fname));
-extern void mch_early_init __ARGS((void));
-extern void mch_exit __ARGS((int r));
-extern void mch_settmode __ARGS((int tmode));
-extern void mch_setmouse __ARGS((int on));
-extern int mch_screenmode __ARGS((char_u *arg));
-extern int mch_get_shellsize __ARGS((void));
-extern void mch_set_shellsize __ARGS((void));
-extern void mch_new_shellsize __ARGS((void));
-extern void mch_check_columns __ARGS((void));
-extern int mch_call_shell __ARGS((char_u *cmd, int options));
-extern void mch_breakcheck __ARGS((void));
-extern int mch_has_exp_wildcard __ARGS((char_u *p));
-extern int mch_has_wildcard __ARGS((char_u *p));
-extern int mch_chdir __ARGS((char *path));
-extern char *djgpp_setlocale __ARGS((void));
-extern int clip_mch_own_selection __ARGS((VimClipboard *cbd));
-extern void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
-extern void clip_mch_request_selection __ARGS((VimClipboard *cbd));
-extern void clip_mch_set_selection __ARGS((VimClipboard *cbd));
-extern long mch_getperm __ARGS((char_u *name));
-extern int mch_setperm __ARGS((char_u *name, long perm));
-extern void mch_hide __ARGS((char_u *name));
-extern int mch_isdir __ARGS((char_u *name));
-extern int mch_can_exe __ARGS((char_u *name));
-extern int mch_nodetype __ARGS((char_u *name));
-extern int mch_dirname __ARGS((char_u *buf, int len));
-extern int mch_remove __ARGS((char_u *name));
-extern char_u *mch_getenv __ARGS((char_u *name));
-extern int mch_get_user_name __ARGS((char_u *s, int len));
-extern void mch_get_host_name __ARGS((char_u *s, int len));
+void mch_set_normal_colors __ARGS((void));
+void mch_update_cursor __ARGS((void));
+long_u mch_avail_mem __ARGS((int special));
+void mch_delay __ARGS((long msec, int ignoreinput));
+void mch_write __ARGS((char_u *s, int len));
+int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
+int mch_char_avail __ARGS((void));
+void mch_suspend __ARGS((void));
+void mch_init __ARGS((void));
+int mch_check_win __ARGS((int argc, char **argv));
+int mch_input_isatty __ARGS((void));
+void fname_case __ARGS((char_u *name, int len));
+long mch_get_pid __ARGS((void));
+int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
+void slash_adjust __ARGS((char_u *p));
+int mch_isFullName __ARGS((char_u *fname));
+void mch_early_init __ARGS((void));
+void mch_exit __ARGS((int r));
+void mch_settmode __ARGS((int tmode));
+void mch_setmouse __ARGS((int on));
+int mch_screenmode __ARGS((char_u *arg));
+int mch_get_shellsize __ARGS((void));
+void mch_set_shellsize __ARGS((void));
+void mch_new_shellsize __ARGS((void));
+void mch_check_columns __ARGS((void));
+int mch_call_shell __ARGS((char_u *cmd, int options));
+void mch_breakcheck __ARGS((void));
+int mch_has_exp_wildcard __ARGS((char_u *p));
+int mch_has_wildcard __ARGS((char_u *p));
+int mch_chdir __ARGS((char *path));
+char *djgpp_setlocale __ARGS((void));
+int clip_mch_own_selection __ARGS((VimClipboard *cbd));
+void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
+void clip_mch_request_selection __ARGS((VimClipboard *cbd));
+void clip_mch_set_selection __ARGS((VimClipboard *cbd));
+long mch_getperm __ARGS((char_u *name));
+int mch_setperm __ARGS((char_u *name, long perm));
+void mch_hide __ARGS((char_u *name));
+int mch_isdir __ARGS((char_u *name));
+int mch_can_exe __ARGS((char_u *name));
+int mch_nodetype __ARGS((char_u *name));
+int mch_dirname __ARGS((char_u *buf, int len));
+int mch_remove __ARGS((char_u *name));
+char_u *mch_getenv __ARGS((char_u *name));
+int mch_get_user_name __ARGS((char_u *s, int len));
+void mch_get_host_name __ARGS((char_u *s, int len));
 /* vim: set ft=c : */
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index 8ec3db6c2..5bf6c8abe 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -1,73 +1,73 @@
 /* os_unix.c */
-extern void mch_write __ARGS((char_u *s, int len));
-extern int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
-extern int mch_char_avail __ARGS((void));
-extern long_u mch_total_mem __ARGS((int special));
-extern void mch_delay __ARGS((long msec, int ignoreinput));
-extern int mch_stackcheck __ARGS((char *p));
-extern void mch_startjmp __ARGS((void));
-extern void mch_endjmp __ARGS((void));
-extern void mch_didjmp __ARGS((void));
-extern void mch_suspend __ARGS((void));
-extern void mch_init __ARGS((void));
-extern void reset_signals __ARGS((void));
-extern int vim_handle_signal __ARGS((int sig));
-extern int mch_check_win __ARGS((int argc, char **argv));
-extern int mch_input_isatty __ARGS((void));
-extern int mch_can_restore_title __ARGS((void));
-extern int mch_can_restore_icon __ARGS((void));
-extern void mch_settitle __ARGS((char_u *title, char_u *icon));
-extern void mch_restore_title __ARGS((int which));
-extern int vim_is_xterm __ARGS((char_u *name));
-extern int use_xterm_mouse __ARGS((void));
-extern int vim_is_iris __ARGS((char_u *name));
-extern int vim_is_vt300 __ARGS((char_u *name));
-extern int vim_is_fastterm __ARGS((char_u *name));
-extern int mch_get_user_name __ARGS((char_u *s, int len));
-extern int mch_get_uname __ARGS((uid_t uid, char_u *s, int len));
-extern void mch_get_host_name __ARGS((char_u *s, int len));
-extern long mch_get_pid __ARGS((void));
-extern int mch_dirname __ARGS((char_u *buf, int len));
-extern void slash_adjust __ARGS((char_u *p));
-extern int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
-extern int mch_isFullName __ARGS((char_u *fname));
-extern void fname_case __ARGS((char_u *name, int len));
-extern long mch_getperm __ARGS((char_u *name));
-extern int mch_setperm __ARGS((char_u *name, long perm));
-extern vim_acl_T mch_get_acl __ARGS((char_u *fname));
-extern void mch_set_acl __ARGS((char_u *fname, vim_acl_T aclent));
-extern void mch_free_acl __ARGS((vim_acl_T aclent));
-extern void mch_hide __ARGS((char_u *name));
-extern int mch_isdir __ARGS((char_u *name));
-extern int mch_can_exe __ARGS((char_u *name));
-extern int mch_nodetype __ARGS((char_u *name));
-extern void mch_early_init __ARGS((void));
-extern void mch_free_mem __ARGS((void));
-extern void mch_exit __ARGS((int r));
-extern void mch_settmode __ARGS((int tmode));
-extern void get_stty __ARGS((void));
-extern void mch_setmouse __ARGS((int on));
-extern void check_mouse_termcode __ARGS((void));
-extern int mch_screenmode __ARGS((char_u *arg));
-extern int mch_get_shellsize __ARGS((void));
-extern void mch_set_shellsize __ARGS((void));
-extern void mch_new_shellsize __ARGS((void));
-extern int mch_call_shell __ARGS((char_u *cmd, int options));
-extern void mch_breakcheck __ARGS((void));
-extern int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
-extern int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
-extern int mch_has_exp_wildcard __ARGS((char_u *p));
-extern int mch_has_wildcard __ARGS((char_u *p));
-extern int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result));
-extern void setup_term_clip __ARGS((void));
-extern void start_xterm_trace __ARGS((int button));
-extern void stop_xterm_trace __ARGS((void));
-extern void clear_xterm_clip __ARGS((void));
-extern int clip_xterm_own_selection __ARGS((VimClipboard *cbd));
-extern void clip_xterm_lose_selection __ARGS((VimClipboard *cbd));
-extern void clip_xterm_request_selection __ARGS((VimClipboard *cbd));
-extern void clip_xterm_set_selection __ARGS((VimClipboard *cbd));
-extern int xsmp_handle_requests __ARGS((void));
-extern void xsmp_init __ARGS((void));
-extern void xsmp_close __ARGS((void));
+void mch_write __ARGS((char_u *s, int len));
+int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
+int mch_char_avail __ARGS((void));
+long_u mch_total_mem __ARGS((int special));
+void mch_delay __ARGS((long msec, int ignoreinput));
+int mch_stackcheck __ARGS((char *p));
+void mch_startjmp __ARGS((void));
+void mch_endjmp __ARGS((void));
+void mch_didjmp __ARGS((void));
+void mch_suspend __ARGS((void));
+void mch_init __ARGS((void));
+void reset_signals __ARGS((void));
+int vim_handle_signal __ARGS((int sig));
+int mch_check_win __ARGS((int argc, char **argv));
+int mch_input_isatty __ARGS((void));
+int mch_can_restore_title __ARGS((void));
+int mch_can_restore_icon __ARGS((void));
+void mch_settitle __ARGS((char_u *title, char_u *icon));
+void mch_restore_title __ARGS((int which));
+int vim_is_xterm __ARGS((char_u *name));
+int use_xterm_mouse __ARGS((void));
+int vim_is_iris __ARGS((char_u *name));
+int vim_is_vt300 __ARGS((char_u *name));
+int vim_is_fastterm __ARGS((char_u *name));
+int mch_get_user_name __ARGS((char_u *s, int len));
+int mch_get_uname __ARGS((uid_t uid, char_u *s, int len));
+void mch_get_host_name __ARGS((char_u *s, int len));
+long mch_get_pid __ARGS((void));
+int mch_dirname __ARGS((char_u *buf, int len));
+void slash_adjust __ARGS((char_u *p));
+int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
+int mch_isFullName __ARGS((char_u *fname));
+void fname_case __ARGS((char_u *name, int len));
+long mch_getperm __ARGS((char_u *name));
+int mch_setperm __ARGS((char_u *name, long perm));
+vim_acl_T mch_get_acl __ARGS((char_u *fname));
+void mch_set_acl __ARGS((char_u *fname, vim_acl_T aclent));
+void mch_free_acl __ARGS((vim_acl_T aclent));
+void mch_hide __ARGS((char_u *name));
+int mch_isdir __ARGS((char_u *name));
+int mch_can_exe __ARGS((char_u *name));
+int mch_nodetype __ARGS((char_u *name));
+void mch_early_init __ARGS((void));
+void mch_free_mem __ARGS((void));
+void mch_exit __ARGS((int r));
+void mch_settmode __ARGS((int tmode));
+void get_stty __ARGS((void));
+void mch_setmouse __ARGS((int on));
+void check_mouse_termcode __ARGS((void));
+int mch_screenmode __ARGS((char_u *arg));
+int mch_get_shellsize __ARGS((void));
+void mch_set_shellsize __ARGS((void));
+void mch_new_shellsize __ARGS((void));
+int mch_call_shell __ARGS((char_u *cmd, int options));
+void mch_breakcheck __ARGS((void));
+int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
+int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
+int mch_has_exp_wildcard __ARGS((char_u *p));
+int mch_has_wildcard __ARGS((char_u *p));
+int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result));
+void setup_term_clip __ARGS((void));
+void start_xterm_trace __ARGS((int button));
+void stop_xterm_trace __ARGS((void));
+void clear_xterm_clip __ARGS((void));
+int clip_xterm_own_selection __ARGS((VimClipboard *cbd));
+void clip_xterm_lose_selection __ARGS((VimClipboard *cbd));
+void clip_xterm_request_selection __ARGS((VimClipboard *cbd));
+void clip_xterm_set_selection __ARGS((VimClipboard *cbd));
+int xsmp_handle_requests __ARGS((void));
+void xsmp_init __ARGS((void));
+void xsmp_close __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
index d2f5d089a..5ca85c7b4 100644
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -1,54 +1,54 @@
 /* os_win32.c */
-extern int dyn_libintl_init __ARGS((char *libname));
-extern void dyn_libintl_end __ARGS((void));
-extern void PlatformId __ARGS((void));
-extern int mch_windows95 __ARGS((void));
-extern void mch_setmouse __ARGS((int on));
-extern void mch_update_cursor __ARGS((void));
-extern int mch_char_avail __ARGS((void));
-extern int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
-extern void mch_init __ARGS((void));
-extern void mch_exit __ARGS((int r));
-extern int mch_check_win __ARGS((int argc, char **argv));
-extern void fname_case __ARGS((char_u *name, int len));
-extern int mch_get_user_name __ARGS((char_u *s, int len));
-extern void mch_get_host_name __ARGS((char_u *s, int len));
-extern long mch_get_pid __ARGS((void));
-extern int mch_dirname __ARGS((char_u *buf, int len));
-extern long mch_getperm __ARGS((char_u *name));
-extern int mch_setperm __ARGS((char_u *name, long perm));
-extern void mch_hide __ARGS((char_u *name));
-extern int mch_isdir __ARGS((char_u *name));
-extern int mch_is_linked __ARGS((char_u *fname));
-extern int mch_writable __ARGS((char_u *name));
-extern int mch_can_exe __ARGS((char_u *name));
-extern int mch_nodetype __ARGS((char_u *name));
-extern vim_acl_T mch_get_acl __ARGS((char_u *fname));
-extern void mch_set_acl __ARGS((char_u *fname, vim_acl_T acl));
-extern void mch_free_acl __ARGS((vim_acl_T acl));
-extern void mch_settmode __ARGS((int tmode));
-extern int mch_get_shellsize __ARGS((void));
-extern void mch_set_shellsize __ARGS((void));
-extern void mch_new_shellsize __ARGS((void));
-extern void mch_set_winsize_now __ARGS((void));
-extern int mch_call_shell __ARGS((char_u *cmd, int options));
-extern void mch_set_normal_colors __ARGS((void));
-extern void mch_write __ARGS((char_u *s, int len));
-extern void mch_delay __ARGS((long msec, int ignoreinput));
-extern int mch_remove __ARGS((char_u *name));
-extern void mch_breakcheck __ARGS((void));
-extern long_u mch_avail_mem __ARGS((int special));
-extern int mch_wrename __ARGS((WCHAR *wold, WCHAR *wnew));
-extern int mch_rename __ARGS((const char *pszOldFile, const char *pszNewFile));
-extern char *default_shell __ARGS((void));
-extern int mch_access __ARGS((char *n, int p));
-extern int mch_open __ARGS((char *name, int flags, int mode));
-extern FILE *mch_fopen __ARGS((char *name, char *mode));
-extern int mch_copy_file_attribute __ARGS((char_u *from, char_u *to));
-extern int myresetstkoflw __ARGS((void));
-extern int get_cmd_argsW __ARGS((char ***argvp));
-extern void free_cmd_argsW __ARGS((void));
-extern void used_file_arg __ARGS((char *name, int literal, int full_path, int diff_mode));
-extern void set_alist_count __ARGS((void));
-extern void fix_arg_enc __ARGS((void));
+int dyn_libintl_init __ARGS((char *libname));
+void dyn_libintl_end __ARGS((void));
+void PlatformId __ARGS((void));
+int mch_windows95 __ARGS((void));
+void mch_setmouse __ARGS((int on));
+void mch_update_cursor __ARGS((void));
+int mch_char_avail __ARGS((void));
+int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
+void mch_init __ARGS((void));
+void mch_exit __ARGS((int r));
+int mch_check_win __ARGS((int argc, char **argv));
+void fname_case __ARGS((char_u *name, int len));
+int mch_get_user_name __ARGS((char_u *s, int len));
+void mch_get_host_name __ARGS((char_u *s, int len));
+long mch_get_pid __ARGS((void));
+int mch_dirname __ARGS((char_u *buf, int len));
+long mch_getperm __ARGS((char_u *name));
+int mch_setperm __ARGS((char_u *name, long perm));
+void mch_hide __ARGS((char_u *name));
+int mch_isdir __ARGS((char_u *name));
+int mch_is_linked __ARGS((char_u *fname));
+int mch_writable __ARGS((char_u *name));
+int mch_can_exe __ARGS((char_u *name));
+int mch_nodetype __ARGS((char_u *name));
+vim_acl_T mch_get_acl __ARGS((char_u *fname));
+void mch_set_acl __ARGS((char_u *fname, vim_acl_T acl));
+void mch_free_acl __ARGS((vim_acl_T acl));
+void mch_settmode __ARGS((int tmode));
+int mch_get_shellsize __ARGS((void));
+void mch_set_shellsize __ARGS((void));
+void mch_new_shellsize __ARGS((void));
+void mch_set_winsize_now __ARGS((void));
+int mch_call_shell __ARGS((char_u *cmd, int options));
+void mch_set_normal_colors __ARGS((void));
+void mch_write __ARGS((char_u *s, int len));
+void mch_delay __ARGS((long msec, int ignoreinput));
+int mch_remove __ARGS((char_u *name));
+void mch_breakcheck __ARGS((void));
+long_u mch_avail_mem __ARGS((int special));
+int mch_wrename __ARGS((WCHAR *wold, WCHAR *wnew));
+int mch_rename __ARGS((const char *pszOldFile, const char *pszNewFile));
+char *default_shell __ARGS((void));
+int mch_access __ARGS((char *n, int p));
+int mch_open __ARGS((char *name, int flags, int mode));
+FILE *mch_fopen __ARGS((char *name, char *mode));
+int mch_copy_file_attribute __ARGS((char_u *from, char_u *to));
+int myresetstkoflw __ARGS((void));
+int get_cmd_argsW __ARGS((char ***argvp));
+void free_cmd_argsW __ARGS((void));
+void used_file_arg __ARGS((char *name, int literal, int full_path, int diff_mode));
+void set_alist_count __ARGS((void));
+void fix_arg_enc __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/proto/quickfix.pro b/src/proto/quickfix.pro
index e939db21e..408bf6dec 100644
--- a/src/proto/quickfix.pro
+++ b/src/proto/quickfix.pro
@@ -1,30 +1,30 @@
 /* quickfix.c */
-extern int qf_init __ARGS((win_T *wp, char_u *efile, char_u *errorformat, int newlist));
-extern void qf_free_all __ARGS((win_T *wp));
-extern void copy_loclist __ARGS((win_T *from, win_T *to));
-extern void qf_jump __ARGS((qf_info_T *qi, int dir, int errornr, int forceit));
-extern void qf_list __ARGS((exarg_T *eap));
-extern void qf_age __ARGS((exarg_T *eap));
-extern void qf_mark_adjust __ARGS((win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after));
-extern void ex_cwindow __ARGS((exarg_T *eap));
-extern void ex_cclose __ARGS((exarg_T *eap));
-extern void ex_copen __ARGS((exarg_T *eap));
-extern linenr_T qf_current_entry __ARGS((win_T *wp));
-extern int bt_quickfix __ARGS((buf_T *buf));
-extern int bt_nofile __ARGS((buf_T *buf));
-extern int bt_dontwrite __ARGS((buf_T *buf));
-extern int bt_dontwrite_msg __ARGS((buf_T *buf));
-extern int buf_hide __ARGS((buf_T *buf));
-extern int grep_internal __ARGS((cmdidx_T cmdidx));
-extern void ex_make __ARGS((exarg_T *eap));
-extern void ex_cc __ARGS((exarg_T *eap));
-extern void ex_cnext __ARGS((exarg_T *eap));
-extern void ex_cfile __ARGS((exarg_T *eap));
-extern void ex_vimgrep __ARGS((exarg_T *eap));
-extern char_u *skip_vimgrep_pat __ARGS((char_u *p, char_u **s, int *flags));
-extern int get_errorlist __ARGS((win_T *wp, list_T *list));
-extern int set_errorlist __ARGS((win_T *wp, list_T *list, int action));
-extern void ex_cbuffer __ARGS((exarg_T *eap));
-extern void ex_cexpr __ARGS((exarg_T *eap));
-extern void ex_helpgrep __ARGS((exarg_T *eap));
+int qf_init __ARGS((win_T *wp, char_u *efile, char_u *errorformat, int newlist));
+void qf_free_all __ARGS((win_T *wp));
+void copy_loclist __ARGS((win_T *from, win_T *to));
+void qf_jump __ARGS((qf_info_T *qi, int dir, int errornr, int forceit));
+void qf_list __ARGS((exarg_T *eap));
+void qf_age __ARGS((exarg_T *eap));
+void qf_mark_adjust __ARGS((win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after));
+void ex_cwindow __ARGS((exarg_T *eap));
+void ex_cclose __ARGS((exarg_T *eap));
+void ex_copen __ARGS((exarg_T *eap));
+linenr_T qf_current_entry __ARGS((win_T *wp));
+int bt_quickfix __ARGS((buf_T *buf));
+int bt_nofile __ARGS((buf_T *buf));
+int bt_dontwrite __ARGS((buf_T *buf));
+int bt_dontwrite_msg __ARGS((buf_T *buf));
+int buf_hide __ARGS((buf_T *buf));
+int grep_internal __ARGS((cmdidx_T cmdidx));
+void ex_make __ARGS((exarg_T *eap));
+void ex_cc __ARGS((exarg_T *eap));
+void ex_cnext __ARGS((exarg_T *eap));
+void ex_cfile __ARGS((exarg_T *eap));
+void ex_vimgrep __ARGS((exarg_T *eap));
+char_u *skip_vimgrep_pat __ARGS((char_u *p, char_u **s, int *flags));
+int get_errorlist __ARGS((win_T *wp, list_T *list));
+int set_errorlist __ARGS((win_T *wp, list_T *list, int action));
+void ex_cbuffer __ARGS((exarg_T *eap));
+void ex_cexpr __ARGS((exarg_T *eap));
+void ex_helpgrep __ARGS((exarg_T *eap));
 /* vim: set ft=c : */
diff --git a/src/proto/screen.pro b/src/proto/screen.pro
index 2abf18bcf..c534a1f9e 100644
--- a/src/proto/screen.pro
+++ b/src/proto/screen.pro
@@ -1,50 +1,50 @@
 /* screen.c */
-extern void redraw_later __ARGS((int type));
-extern void redraw_win_later __ARGS((win_T *wp, int type));
-extern void redraw_later_clear __ARGS((void));
-extern void redraw_all_later __ARGS((int type));
-extern void redraw_curbuf_later __ARGS((int type));
-extern void redraw_buf_later __ARGS((buf_T *buf, int type));
-extern void redrawWinline __ARGS((linenr_T lnum, int invalid));
-extern void update_curbuf __ARGS((int type));
-extern void update_screen __ARGS((int type));
-extern void update_debug_sign __ARGS((buf_T *buf, linenr_T lnum));
-extern void updateWindow __ARGS((win_T *wp));
-extern void rl_mirror __ARGS((char_u *str));
-extern void status_redraw_all __ARGS((void));
-extern void status_redraw_curbuf __ARGS((void));
-extern void redraw_statuslines __ARGS((void));
-extern void win_redraw_last_status __ARGS((frame_T *frp));
-extern void win_redr_status_matches __ARGS((expand_T *xp, int num_matches, char_u **matches, int match, int showtail));
-extern void win_redr_status __ARGS((win_T *wp));
-extern int stl_connected __ARGS((win_T *wp));
-extern int get_keymap_str __ARGS((win_T *wp, char_u *buf, int len));
-extern void screen_putchar __ARGS((int c, int row, int col, int attr));
-extern void screen_getbytes __ARGS((int row, int col, char_u *bytes, int *attrp));
-extern void screen_puts __ARGS((char_u *text, int row, int col, int attr));
-extern void screen_puts_len __ARGS((char_u *text, int len, int row, int col, int attr));
-extern void screen_stop_highlight __ARGS((void));
-extern void reset_cterm_colors __ARGS((void));
-extern void screen_draw_rectangle __ARGS((int row, int col, int height, int width, int invert));
-extern void screen_fill __ARGS((int start_row, int end_row, int start_col, int end_col, int c1, int c2, int attr));
-extern void check_for_delay __ARGS((int check_msg_scroll));
-extern int screen_valid __ARGS((int clear));
-extern void screenalloc __ARGS((int clear));
-extern void free_screenlines __ARGS((void));
-extern void screenclear __ARGS((void));
-extern int can_clear __ARGS((char_u *p));
-extern void screen_start __ARGS((void));
-extern void windgoto __ARGS((int row, int col));
-extern void setcursor __ARGS((void));
-extern int win_ins_lines __ARGS((win_T *wp, int row, int line_count, int invalid, int mayclear));
-extern int win_del_lines __ARGS((win_T *wp, int row, int line_count, int invalid, int mayclear));
-extern int screen_ins_lines __ARGS((int off, int row, int line_count, int end, win_T *wp));
-extern int screen_del_lines __ARGS((int off, int row, int line_count, int end, int force, win_T *wp));
-extern int showmode __ARGS((void));
-extern void unshowmode __ARGS((int force));
-extern void get_trans_bufname __ARGS((buf_T *buf));
-extern int redrawing __ARGS((void));
-extern int messaging __ARGS((void));
-extern void showruler __ARGS((int always));
-extern int number_width __ARGS((win_T *wp));
+void redraw_later __ARGS((int type));
+void redraw_win_later __ARGS((win_T *wp, int type));
+void redraw_later_clear __ARGS((void));
+void redraw_all_later __ARGS((int type));
+void redraw_curbuf_later __ARGS((int type));
+void redraw_buf_later __ARGS((buf_T *buf, int type));
+void redrawWinline __ARGS((linenr_T lnum, int invalid));
+void update_curbuf __ARGS((int type));
+void update_screen __ARGS((int type));
+void update_debug_sign __ARGS((buf_T *buf, linenr_T lnum));
+void updateWindow __ARGS((win_T *wp));
+void rl_mirror __ARGS((char_u *str));
+void status_redraw_all __ARGS((void));
+void status_redraw_curbuf __ARGS((void));
+void redraw_statuslines __ARGS((void));
+void win_redraw_last_status __ARGS((frame_T *frp));
+void win_redr_status_matches __ARGS((expand_T *xp, int num_matches, char_u **matches, int match, int showtail));
+void win_redr_status __ARGS((win_T *wp));
+int stl_connected __ARGS((win_T *wp));
+int get_keymap_str __ARGS((win_T *wp, char_u *buf, int len));
+void screen_putchar __ARGS((int c, int row, int col, int attr));
+void screen_getbytes __ARGS((int row, int col, char_u *bytes, int *attrp));
+void screen_puts __ARGS((char_u *text, int row, int col, int attr));
+void screen_puts_len __ARGS((char_u *text, int len, int row, int col, int attr));
+void screen_stop_highlight __ARGS((void));
+void reset_cterm_colors __ARGS((void));
+void screen_draw_rectangle __ARGS((int row, int col, int height, int width, int invert));
+void screen_fill __ARGS((int start_row, int end_row, int start_col, int end_col, int c1, int c2, int attr));
+void check_for_delay __ARGS((int check_msg_scroll));
+int screen_valid __ARGS((int clear));
+void screenalloc __ARGS((int clear));
+void free_screenlines __ARGS((void));
+void screenclear __ARGS((void));
+int can_clear __ARGS((char_u *p));
+void screen_start __ARGS((void));
+void windgoto __ARGS((int row, int col));
+void setcursor __ARGS((void));
+int win_ins_lines __ARGS((win_T *wp, int row, int line_count, int invalid, int mayclear));
+int win_del_lines __ARGS((win_T *wp, int row, int line_count, int invalid, int mayclear));
+int screen_ins_lines __ARGS((int off, int row, int line_count, int end, win_T *wp));
+int screen_del_lines __ARGS((int off, int row, int line_count, int end, int force, win_T *wp));
+int showmode __ARGS((void));
+void unshowmode __ARGS((int force));
+void get_trans_bufname __ARGS((buf_T *buf));
+int redrawing __ARGS((void));
+int messaging __ARGS((void));
+void showruler __ARGS((int always));
+int number_width __ARGS((win_T *wp));
 /* vim: set ft=c : */
diff --git a/src/proto/search.pro b/src/proto/search.pro
index b4d4dc753..ceaca2266 100644
--- a/src/proto/search.pro
+++ b/src/proto/search.pro
@@ -1,36 +1,36 @@
 /* search.c */
-extern int search_regcomp __ARGS((char_u *pat, int pat_save, int pat_use, int options, regmmatch_T *regmatch));
-extern char_u *get_search_pat __ARGS((void));
-extern void save_search_patterns __ARGS((void));
-extern void restore_search_patterns __ARGS((void));
-extern void free_search_patterns __ARGS((void));
-extern int ignorecase __ARGS((char_u *pat));
-extern char_u *last_search_pat __ARGS((void));
-extern void reset_search_dir __ARGS((void));
-extern void set_last_search_pat __ARGS((char_u *s, int idx, int magic, int setlast));
-extern void last_pat_prog __ARGS((regmmatch_T *regmatch));
-extern int searchit __ARGS((win_T *win, buf_T *buf, pos_T *pos, int dir, char_u *pat, long count, int options, int pat_use, linenr_T stop_lnum));
-extern int do_search __ARGS((oparg_T *oap, int dirc, char_u *pat, long count, int options));
-extern int search_for_exact_line __ARGS((buf_T *buf, pos_T *pos, int dir, char_u *pat));
-extern int searchc __ARGS((cmdarg_T *cap, int t_cmd));
-extern pos_T *findmatch __ARGS((oparg_T *oap, int initc));
-extern pos_T *findmatchlimit __ARGS((oparg_T *oap, int initc, int flags, int maxtravel));
-extern void showmatch __ARGS((int c));
-extern int findsent __ARGS((int dir, long count));
-extern int findpar __ARGS((int *pincl, int dir, long count, int what, int both));
-extern int startPS __ARGS((linenr_T lnum, int para, int both));
-extern int fwd_word __ARGS((long count, int bigword, int eol));
-extern int bck_word __ARGS((long count, int bigword, int stop));
-extern int end_word __ARGS((long count, int bigword, int stop, int empty));
-extern int bckend_word __ARGS((long count, int bigword, int eol));
-extern int current_word __ARGS((oparg_T *oap, long count, int include, int bigword));
-extern int current_sent __ARGS((oparg_T *oap, long count, int include));
-extern int current_block __ARGS((oparg_T *oap, long count, int include, int what, int other));
-extern int current_tagblock __ARGS((oparg_T *oap, long count_arg, int include));
-extern int current_par __ARGS((oparg_T *oap, long count, int include, int type));
-extern int current_quote __ARGS((oparg_T *oap, long count, int include, int quotechar));
-extern int linewhite __ARGS((linenr_T lnum));
-extern void find_pattern_in_path __ARGS((char_u *ptr, int dir, int len, int whole, int skip_comments, int type, long count, int action, linenr_T start_lnum, linenr_T end_lnum));
-extern int read_viminfo_search_pattern __ARGS((vir_T *virp, int force));
-extern void write_viminfo_search_pattern __ARGS((FILE *fp));
+int search_regcomp __ARGS((char_u *pat, int pat_save, int pat_use, int options, regmmatch_T *regmatch));
+char_u *get_search_pat __ARGS((void));
+void save_search_patterns __ARGS((void));
+void restore_search_patterns __ARGS((void));
+void free_search_patterns __ARGS((void));
+int ignorecase __ARGS((char_u *pat));
+char_u *last_search_pat __ARGS((void));
+void reset_search_dir __ARGS((void));
+void set_last_search_pat __ARGS((char_u *s, int idx, int magic, int setlast));
+void last_pat_prog __ARGS((regmmatch_T *regmatch));
+int searchit __ARGS((win_T *win, buf_T *buf, pos_T *pos, int dir, char_u *pat, long count, int options, int pat_use, linenr_T stop_lnum));
+int do_search __ARGS((oparg_T *oap, int dirc, char_u *pat, long count, int options));
+int search_for_exact_line __ARGS((buf_T *buf, pos_T *pos, int dir, char_u *pat));
+int searchc __ARGS((cmdarg_T *cap, int t_cmd));
+pos_T *findmatch __ARGS((oparg_T *oap, int initc));
+pos_T *findmatchlimit __ARGS((oparg_T *oap, int initc, int flags, int maxtravel));
+void showmatch __ARGS((int c));
+int findsent __ARGS((int dir, long count));
+int findpar __ARGS((int *pincl, int dir, long count, int what, int both));
+int startPS __ARGS((linenr_T lnum, int para, int both));
+int fwd_word __ARGS((long count, int bigword, int eol));
+int bck_word __ARGS((long count, int bigword, int stop));
+int end_word __ARGS((long count, int bigword, int stop, int empty));
+int bckend_word __ARGS((long count, int bigword, int eol));
+int current_word __ARGS((oparg_T *oap, long count, int include, int bigword));
+int current_sent __ARGS((oparg_T *oap, long count, int include));
+int current_block __ARGS((oparg_T *oap, long count, int include, int what, int other));
+int current_tagblock __ARGS((oparg_T *oap, long count_arg, int include));
+int current_par __ARGS((oparg_T *oap, long count, int include, int type));
+int current_quote __ARGS((oparg_T *oap, long count, int include, int quotechar));
+int linewhite __ARGS((linenr_T lnum));
+void find_pattern_in_path __ARGS((char_u *ptr, int dir, int len, int whole, int skip_comments, int type, long count, int action, linenr_T start_lnum, linenr_T end_lnum));
+int read_viminfo_search_pattern __ARGS((vir_T *virp, int force));
+void write_viminfo_search_pattern __ARGS((FILE *fp));
 /* vim: set ft=c : */
diff --git a/src/proto/term.pro b/src/proto/term.pro
index 9ce594ead..66c4c2ed5 100644
--- a/src/proto/term.pro
+++ b/src/proto/term.pro
@@ -1,60 +1,60 @@
 /* term.c */
-extern int set_termname __ARGS((char_u *term));
-extern void set_mouse_termcode __ARGS((int n, char_u *s));
-extern void del_mouse_termcode __ARGS((int n));
-extern void getlinecol __ARGS((long *cp, long *rp));
-extern int add_termcap_entry __ARGS((char_u *name, int force));
-extern int term_is_8bit __ARGS((char_u *name));
-extern int term_is_gui __ARGS((char_u *name));
-extern char_u *tltoa __ARGS((unsigned long i));
-extern void termcapinit __ARGS((char_u *name));
-extern void out_flush __ARGS((void));
-extern void out_flush_check __ARGS((void));
-extern void out_trash __ARGS((void));
-extern void out_char __ARGS((unsigned c));
-extern void out_str_nf __ARGS((char_u *s));
-extern void out_str __ARGS((char_u *s));
-extern void term_windgoto __ARGS((int row, int col));
-extern void term_cursor_right __ARGS((int i));
-extern void term_append_lines __ARGS((int line_count));
-extern void term_delete_lines __ARGS((int line_count));
-extern void term_set_winpos __ARGS((int x, int y));
-extern void term_set_winsize __ARGS((int width, int height));
-extern void term_fg_color __ARGS((int n));
-extern void term_bg_color __ARGS((int n));
-extern void term_settitle __ARGS((char_u *title));
-extern void ttest __ARGS((int pairs));
-extern void add_long_to_buf __ARGS((long_u val, char_u *dst));
-extern void check_shellsize __ARGS((void));
-extern void win_new_shellsize __ARGS((void));
-extern void shell_resized __ARGS((void));
-extern void shell_resized_check __ARGS((void));
-extern void set_shellsize __ARGS((int width, int height, int mustset));
-extern void settmode __ARGS((int tmode));
-extern void starttermcap __ARGS((void));
-extern void stoptermcap __ARGS((void));
-extern void may_req_termresponse __ARGS((void));
-extern int swapping_screen __ARGS((void));
-extern void setmouse __ARGS((void));
-extern int mouse_has __ARGS((int c));
-extern int mouse_model_popup __ARGS((void));
-extern void scroll_start __ARGS((void));
-extern void cursor_on __ARGS((void));
-extern void cursor_off __ARGS((void));
-extern void term_cursor_shape __ARGS((void));
-extern void scroll_region_set __ARGS((win_T *wp, int off));
-extern void scroll_region_reset __ARGS((void));
-extern void clear_termcodes __ARGS((void));
-extern void add_termcode __ARGS((char_u *name, char_u *string, int flags));
-extern char_u *find_termcode __ARGS((char_u *name));
-extern char_u *get_termcode __ARGS((int i));
-extern void del_termcode __ARGS((char_u *name));
-extern void set_mouse_topline __ARGS((win_T *wp));
-extern int check_termcode __ARGS((int max_offset, char_u *buf, int buflen));
-extern char_u *replace_termcodes __ARGS((char_u *from, char_u **bufp, int from_part, int do_lt, int special));
-extern int find_term_bykeys __ARGS((char_u *src));
-extern void show_termcodes __ARGS((void));
-extern int show_one_termcode __ARGS((char_u *name, char_u *code, int printit));
-extern char_u *translate_mapping __ARGS((char_u *str, int expmap));
-extern void update_tcap __ARGS((int attr));
+int set_termname __ARGS((char_u *term));
+void set_mouse_termcode __ARGS((int n, char_u *s));
+void del_mouse_termcode __ARGS((int n));
+void getlinecol __ARGS((long *cp, long *rp));
+int add_termcap_entry __ARGS((char_u *name, int force));
+int term_is_8bit __ARGS((char_u *name));
+int term_is_gui __ARGS((char_u *name));
+char_u *tltoa __ARGS((unsigned long i));
+void termcapinit __ARGS((char_u *name));
+void out_flush __ARGS((void));
+void out_flush_check __ARGS((void));
+void out_trash __ARGS((void));
+void out_char __ARGS((unsigned c));
+void out_str_nf __ARGS((char_u *s));
+void out_str __ARGS((char_u *s));
+void term_windgoto __ARGS((int row, int col));
+void term_cursor_right __ARGS((int i));
+void term_append_lines __ARGS((int line_count));
+void term_delete_lines __ARGS((int line_count));
+void term_set_winpos __ARGS((int x, int y));
+void term_set_winsize __ARGS((int width, int height));
+void term_fg_color __ARGS((int n));
+void term_bg_color __ARGS((int n));
+void term_settitle __ARGS((char_u *title));
+void ttest __ARGS((int pairs));
+void add_long_to_buf __ARGS((long_u val, char_u *dst));
+void check_shellsize __ARGS((void));
+void win_new_shellsize __ARGS((void));
+void shell_resized __ARGS((void));
+void shell_resized_check __ARGS((void));
+void set_shellsize __ARGS((int width, int height, int mustset));
+void settmode __ARGS((int tmode));
+void starttermcap __ARGS((void));
+void stoptermcap __ARGS((void));
+void may_req_termresponse __ARGS((void));
+int swapping_screen __ARGS((void));
+void setmouse __ARGS((void));
+int mouse_has __ARGS((int c));
+int mouse_model_popup __ARGS((void));
+void scroll_start __ARGS((void));
+void cursor_on __ARGS((void));
+void cursor_off __ARGS((void));
+void term_cursor_shape __ARGS((void));
+void scroll_region_set __ARGS((win_T *wp, int off));
+void scroll_region_reset __ARGS((void));
+void clear_termcodes __ARGS((void));
+void add_termcode __ARGS((char_u *name, char_u *string, int flags));
+char_u *find_termcode __ARGS((char_u *name));
+char_u *get_termcode __ARGS((int i));
+void del_termcode __ARGS((char_u *name));
+void set_mouse_topline __ARGS((win_T *wp));
+int check_termcode __ARGS((int max_offset, char_u *buf, int buflen));
+char_u *replace_termcodes __ARGS((char_u *from, char_u **bufp, int from_part, int do_lt, int special));
+int find_term_bykeys __ARGS((char_u *src));
+void show_termcodes __ARGS((void));
+int show_one_termcode __ARGS((char_u *name, char_u *code, int printit));
+char_u *translate_mapping __ARGS((char_u *str, int expmap));
+void update_tcap __ARGS((int attr));
 /* vim: set ft=c : */
diff --git a/src/proto/termlib.pro b/src/proto/termlib.pro
index 464b73bb7..4369ecfc6 100644
--- a/src/proto/termlib.pro
+++ b/src/proto/termlib.pro
@@ -1,8 +1,8 @@
 /* termlib.c */
-extern int tgetent __ARGS((char *tbuf, char *term));
-extern int tgetflag __ARGS((char *id));
-extern int tgetnum __ARGS((char *id));
-extern char *tgetstr __ARGS((char *id, char **buf));
-extern char *tgoto __ARGS((char *cm, int col, int line));
-extern int tputs __ARGS((char *cp, int affcnt, void (*outc)(unsigned int)));
+int tgetent __ARGS((char *tbuf, char *term));
+int tgetflag __ARGS((char *id));
+int tgetnum __ARGS((char *id));
+char *tgetstr __ARGS((char *id, char **buf));
+char *tgoto __ARGS((char *cm, int col, int line));
+int tputs __ARGS((char *cp, int affcnt, void (*outc)(unsigned int)));
 /* vim: set ft=c : */
diff --git a/src/testdir/test55.in b/src/testdir/test55.in
index d7cd4d91a..b20c6c497 100644
--- a/src/testdir/test55.in
+++ b/src/testdir/test55.in
@@ -334,6 +334,14 @@ let l = [0, 1, 2, 3]
 :$put =string(split('abc', '\zs'))
 :$put =string(split('abc', '\zs', 1))
 :"
+:" compare recursively linked list and dict
+:let l = [1, 2, 3, 4]
+:let d = {'1': 1, '2': l, '3': 3}
+:let l[1] = d
+:$put =(l == l)
+:$put =(d == d)
+:$put =(l != deepcopy(l))
+:$put =(d != deepcopy(d))
 :endfun
 :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
 :"