Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

8 files changed, 514 insertions, 514 deletions

diff --git a/usr.bin/vi/include/cl_extern.h b/usr.bin/vi/include/cl_extern.h
index fb7f3ac2e90..af565eda8b9 100644
--- a/usr.bin/vi/include/cl_extern.h
+++ b/usr.bin/vi/include/cl_extern.h
@@ -1,62 +1,62 @@
-/*	$OpenBSD: cl_extern.h,v 1.5 2001/01/29 01:58:46 niklas Exp $	*/
+/*	$OpenBSD: cl_extern.h,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 #ifndef HAVE_CURSES_ADDNSTR
-int addnstr __P((char *, int));
+int addnstr(char *, int);
 #endif
 #ifndef HAVE_CURSES_BEEP
-void beep __P((void));
+void beep(void);
 #endif
 #ifndef HAVE_CURSES_FLASH
-void flash __P((void));
+void flash(void);
 #endif
 #ifndef HAVE_CURSES_IDLOK
-void idlok __P((WINDOW *, int));
+void idlok(WINDOW *, int);
 #endif
 #ifndef HAVE_CURSES_KEYPAD
-int keypad __P((void *, int));
+int keypad(void *, int);
 #endif
 #ifndef HAVE_CURSES_NEWTERM
-void *newterm __P((const char *, FILE *, FILE *));
+void *newterm(const char *, FILE *, FILE *);
 #endif
 #ifndef HAVE_CURSES_SETUPTERM
-void setupterm __P((char *, int, int *));
+void setupterm(char *, int, int *);
 #endif
 #ifdef HAVE_CURSES_TIGETSTR
 char *tigetstr();
 #else
-char *tigetstr __P((char *));
+char *tigetstr(char *);
 #endif
 #ifndef HAVE_CURSES_TIGETSTR
-int tigetnum __P((char *));
-#endif
-int cl_addstr __P((SCR *, const char *, size_t));
-int cl_attr __P((SCR *, scr_attr_t, int));
-int cl_baud __P((SCR *, u_long *));
-int cl_bell __P((SCR *));
-int cl_clrtoeol __P((SCR *));
-int cl_cursor __P((SCR *, size_t *, size_t *));
-int cl_deleteln __P((SCR *));
-int cl_ex_adjust __P((SCR *, exadj_t));
-int cl_insertln __P((SCR *));
-int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
-int cl_move __P((SCR *, size_t, size_t));
-int cl_refresh __P((SCR *, int));
-int cl_rename __P((SCR *, char *, int));
-int cl_suspend __P((SCR *, int *));
-void cl_usage __P((void));
-int sig_init __P((GS *, SCR *));
-int cl_event __P((SCR *, EVENT *, u_int32_t, int));
-int cl_screen __P((SCR *, u_int32_t));
-int cl_quit __P((GS *));
-int cl_getcap __P((SCR *, char *, char **));
-int cl_term_init __P((SCR *));
-int cl_term_end __P((GS *));
-int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
-int cl_optchange __P((SCR *, int, char *, u_long *));
-int cl_omesg __P((SCR *, CL_PRIVATE *, int));
-int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
+int tigetnum(char *);
+#endif
+int cl_addstr(SCR *, const char *, size_t);
+int cl_attr(SCR *, scr_attr_t, int);
+int cl_baud(SCR *, u_long *);
+int cl_bell(SCR *);
+int cl_clrtoeol(SCR *);
+int cl_cursor(SCR *, size_t *, size_t *);
+int cl_deleteln(SCR *);
+int cl_ex_adjust(SCR *, exadj_t);
+int cl_insertln(SCR *);
+int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
+int cl_move(SCR *, size_t, size_t);
+int cl_refresh(SCR *, int);
+int cl_rename(SCR *, char *, int);
+int cl_suspend(SCR *, int *);
+void cl_usage(void);
+int sig_init(GS *, SCR *);
+int cl_event(SCR *, EVENT *, u_int32_t, int);
+int cl_screen(SCR *, u_int32_t);
+int cl_quit(GS *);
+int cl_getcap(SCR *, char *, char **);
+int cl_term_init(SCR *);
+int cl_term_end(GS *);
+int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
+int cl_optchange(SCR *, int, char *, u_long *);
+int cl_omesg(SCR *, CL_PRIVATE *, int);
+int cl_ssize(SCR *, int, size_t *, size_t *, int *);
 #ifdef USE_OCURSES
-void cl_putchar __P((int));
+void cl_putchar(int);
 #else
-int cl_putchar __P((int));
+int cl_putchar(int);
 #endif
diff --git a/usr.bin/vi/include/com_extern.h b/usr.bin/vi/include/com_extern.h
index 73cc83e9626..cd9735dcb4d 100644
--- a/usr.bin/vi/include/com_extern.h
+++ b/usr.bin/vi/include/com_extern.h
@@ -1,201 +1,201 @@
-/*	$OpenBSD: com_extern.h,v 1.3 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: com_extern.h,v 1.4 2002/02/16 21:27:57 millert Exp $	*/
 
 #ifndef HAVE_BSEARCH
 void	*bsearch __P((const void *, const void *, size_t,
    size_t, int (*)(const void *, const void *)));
 #endif
 #ifndef HAVE_SETENV
-int setenv __P((const char *, const char *, int));
+int setenv(const char *, const char *, int);
 #endif
 #ifndef HAVE_UNSETENV
-void unsetenv __P((const char *));
+void unsetenv(const char *);
 #endif
 #ifndef HAVE_GETHOSTNAME
-int gethostname __P((char *, int));
+int gethostname(char *, int);
 #endif
 #ifndef HAVE_GETOPT
-int getopt __P((int, char * const *, const char *)); 
+int getopt(int, char * const *, const char *); 
 #endif
 #ifndef HAVE_MEMCHR
-void *memchr __P((const void *, int, size_t));
+void *memchr(const void *, int, size_t);
 #endif
 #ifndef HAVE_MEMCPY
-void *memcpy __P((void *, const void *, size_t));
+void *memcpy(void *, const void *, size_t);
 #endif
 #ifndef HAVE_MEMMOVE
-void *memmove __P((void *, const void *, size_t));
+void *memmove(void *, const void *, size_t);
 #endif
 #ifndef HAVE_MEMSET
-void *memset __P((void *, int, size_t));
+void *memset(void *, int, size_t);
 #endif
 #ifndef HAVE_MKSTEMP
-int mkstemp __P((char *));
+int mkstemp(char *);
 #endif
 #ifndef HAVE_MMAP
-char *mmap __P((char *, size_t, int, int, int, off_t));
+char *mmap(char *, size_t, int, int, int, off_t);
 #endif
 #ifndef HAVE_MMAP
-int munmap __P((char *, size_t));
+int munmap(char *, size_t);
 #endif
 #ifndef HAVE_SNPRINTF
-int snprintf __P((char *, size_t, const char *, ...));
+int snprintf(char *, size_t, const char *, ...);
 #endif
 #ifndef HAVE_STRDUP
-char *strdup __P((const char *));
+char *strdup(const char *);
 #endif
 #ifndef HAVE_STRERROR
-char *strerror __P((int));
+char *strerror(int);
 #endif
 #ifndef HAVE_STRPBRK
-char *strpbrk __P((const char *, const char *));
+char *strpbrk(const char *, const char *);
 #endif
 #ifndef HAVE_STRSEP
-char *strsep __P((char **, const char *));
+char *strsep(char **, const char *);
 #endif
 #ifndef HAVE_STRTOL
-long strtol __P((const char *, char **, int));
+long strtol(const char *, char **, int);
 #endif
 #ifndef HAVE_STRTOUL
-unsigned long strtoul __P((const char *, char **, int));
+unsigned long strtoul(const char *, char **, int);
 #endif
 #ifndef HAVE_VSNPRINTF
-int vsnprintf __P((char *, size_t, const char *, ...));
-#endif
-SCR *api_fscreen __P((int, char *));
-int api_aline __P((SCR *, recno_t, char *, size_t));
-int api_dline __P((SCR *, recno_t));
-int api_gline __P((SCR *, recno_t, char **, size_t *));
-int api_iline __P((SCR *, recno_t, char *, size_t));
-int api_lline __P((SCR *, recno_t *));
-int api_sline __P((SCR *, recno_t, char *, size_t));
-int api_getmark __P((SCR *, int, MARK *));
-int api_setmark __P((SCR *, int, MARK *));
-int api_nextmark __P((SCR *, int, char *));
-int api_getcursor __P((SCR *, MARK *));
-int api_setcursor __P((SCR *, MARK *));
-void api_emessage __P((SCR *, char *));
-void api_imessage __P((SCR *, char *));
-int api_edit __P((SCR *, char *, SCR **, int));
-int api_escreen __P((SCR *));
-int api_swscreen __P((SCR *, SCR *));
-int api_map __P((SCR *, char *, char *, size_t));
-int api_unmap __P((SCR *, char *));
-int api_opts_get __P((SCR *, char *, char **, int *));
-int api_opts_set __P((SCR *, char *, char *, u_long, int));
-int api_run_str __P((SCR *, char *));
-int cut __P((SCR *, CHAR_T *, MARK *, MARK *, int));
-int cut_line __P((SCR *, recno_t, size_t, size_t, CB *));
-void cut_close __P((GS *));
-TEXT *text_init __P((SCR *, const char *, size_t, size_t));
-void text_lfree __P((TEXTH *));
-void text_free __P((TEXT *));
-int del __P((SCR *, MARK *, MARK *, int));
-FREF *file_add __P((SCR *, CHAR_T *));
-int file_init __P((SCR *, FREF *, char *, int));
-int file_end __P((SCR *, EXF *, int));
-int file_write __P((SCR *, MARK *, MARK *, char *, int));
-int file_m1 __P((SCR *, int, int));
-int file_m2 __P((SCR *, int));
-int file_m3 __P((SCR *, int));
-int file_aw __P((SCR *, int));
-void set_alt_name __P((SCR *, char *));
-lockr_t file_lock __P((SCR *, char *, int *, int, int));
-int v_key_init __P((SCR *));
-void v_key_ilookup __P((SCR *));
-size_t v_key_len __P((SCR *, ARG_CHAR_T));
-CHAR_T *v_key_name __P((SCR *, ARG_CHAR_T));
-int v_key_val __P((SCR *, ARG_CHAR_T));
-int v_event_push __P((SCR *, EVENT *, CHAR_T *, size_t, u_int));
-int v_event_get __P((SCR *, EVENT *, int, u_int32_t));
-void v_event_err __P((SCR *, EVENT *));
-int v_event_flush __P((SCR *, u_int));
-int db_eget __P((SCR *, recno_t, char **, size_t *, int *));
-int db_get __P((SCR *, recno_t, u_int32_t, char **, size_t *));
-int db_delete __P((SCR *, recno_t));
-int db_append __P((SCR *, int, recno_t, char *, size_t));
-int db_insert __P((SCR *, recno_t, char *, size_t));
-int db_set __P((SCR *, recno_t, char *, size_t));
-int db_exist __P((SCR *, recno_t));
-int db_last __P((SCR *, recno_t *));
-void db_err __P((SCR *, recno_t));
-int log_init __P((SCR *, EXF *));
-int log_end __P((SCR *, EXF *));
-int log_cursor __P((SCR *));
-int log_line __P((SCR *, recno_t, u_int));
-int log_mark __P((SCR *, LMARK *));
-int log_backward __P((SCR *, MARK *));
-int log_setline __P((SCR *));
-int log_forward __P((SCR *, MARK *));
-int editor __P((GS *, int, char *[]));
-void v_end __P((GS *));
-int mark_init __P((SCR *, EXF *));
-int mark_end __P((SCR *, EXF *));
-int mark_get __P((SCR *, ARG_CHAR_T, MARK *, mtype_t));
-int mark_set __P((SCR *, ARG_CHAR_T, MARK *, int));
-int mark_insdel __P((SCR *, lnop_t, recno_t));
-void msgq __P((SCR *, mtype_t, const char *, ...));
-void msgq_str __P((SCR *, mtype_t, char *, char *));
-void mod_rpt __P((SCR *));
-void msgq_status __P((SCR *, recno_t, u_int));
-int msg_open __P((SCR *, char *));
-void msg_close __P((GS *));
-const char *msg_cmsg __P((SCR *, cmsg_t, size_t *));
-const char *msg_cat __P((SCR *, const char *, size_t *));
-char *msg_print __P((SCR *, const char *, int *));
-int opts_init __P((SCR *, int *));
-int opts_set __P((SCR *, ARGS *[], char *));
-int o_set __P((SCR *, int, u_int, char *, u_long));
-int opts_empty __P((SCR *, int, int));
-void opts_dump __P((SCR *, enum optdisp));
-int opts_save __P((SCR *, FILE *));
-OPTLIST const *opts_search __P((char *));
-void opts_nomatch __P((SCR *, char *));
-int opts_copy __P((SCR *, SCR *));
-void opts_free __P((SCR *));
-int f_altwerase __P((SCR *, OPTION *, char *, u_long *));
-int f_columns __P((SCR *, OPTION *, char *, u_long *));
-int f_lines __P((SCR *, OPTION *, char *, u_long *));
-int f_lisp __P((SCR *, OPTION *, char *, u_long *));
-int f_msgcat __P((SCR *, OPTION *, char *, u_long *));
-int f_paragraph __P((SCR *, OPTION *, char *, u_long *));
-int f_print __P((SCR *, OPTION *, char *, u_long *));
-int f_readonly __P((SCR *, OPTION *, char *, u_long *));
-int f_recompile __P((SCR *, OPTION *, char *, u_long *));
-int f_reformat __P((SCR *, OPTION *, char *, u_long *));
-int f_section __P((SCR *, OPTION *, char *, u_long *));
-int f_ttywerase __P((SCR *, OPTION *, char *, u_long *));
-int f_w300 __P((SCR *, OPTION *, char *, u_long *));
-int f_w1200 __P((SCR *, OPTION *, char *, u_long *));
-int f_w9600 __P((SCR *, OPTION *, char *, u_long *));
-int f_window __P((SCR *, OPTION *, char *, u_long *));
-int put __P((SCR *, CB *, CHAR_T *, MARK *, MARK *, int));
-int rcv_tmp __P((SCR *, EXF *, char *));
-int rcv_init __P((SCR *));
-int rcv_sync __P((SCR *, u_int));
-int rcv_list __P((SCR *));
-int rcv_read __P((SCR *, FREF *));
-int screen_init __P((GS *, SCR *, SCR **));
-int screen_end __P((SCR *));
-SCR *screen_next __P((SCR *));
+int vsnprintf(char *, size_t, const char *, ...);
+#endif
+SCR *api_fscreen(int, char *);
+int api_aline(SCR *, recno_t, char *, size_t);
+int api_dline(SCR *, recno_t);
+int api_gline(SCR *, recno_t, char **, size_t *);
+int api_iline(SCR *, recno_t, char *, size_t);
+int api_lline(SCR *, recno_t *);
+int api_sline(SCR *, recno_t, char *, size_t);
+int api_getmark(SCR *, int, MARK *);
+int api_setmark(SCR *, int, MARK *);
+int api_nextmark(SCR *, int, char *);
+int api_getcursor(SCR *, MARK *);
+int api_setcursor(SCR *, MARK *);
+void api_emessage(SCR *, char *);
+void api_imessage(SCR *, char *);
+int api_edit(SCR *, char *, SCR **, int);
+int api_escreen(SCR *);
+int api_swscreen(SCR *, SCR *);
+int api_map(SCR *, char *, char *, size_t);
+int api_unmap(SCR *, char *);
+int api_opts_get(SCR *, char *, char **, int *);
+int api_opts_set(SCR *, char *, char *, u_long, int);
+int api_run_str(SCR *, char *);
+int cut(SCR *, CHAR_T *, MARK *, MARK *, int);
+int cut_line(SCR *, recno_t, size_t, size_t, CB *);
+void cut_close(GS *);
+TEXT *text_init(SCR *, const char *, size_t, size_t);
+void text_lfree(TEXTH *);
+void text_free(TEXT *);
+int del(SCR *, MARK *, MARK *, int);
+FREF *file_add(SCR *, CHAR_T *);
+int file_init(SCR *, FREF *, char *, int);
+int file_end(SCR *, EXF *, int);
+int file_write(SCR *, MARK *, MARK *, char *, int);
+int file_m1(SCR *, int, int);
+int file_m2(SCR *, int);
+int file_m3(SCR *, int);
+int file_aw(SCR *, int);
+void set_alt_name(SCR *, char *);
+lockr_t file_lock(SCR *, char *, int *, int, int);
+int v_key_init(SCR *);
+void v_key_ilookup(SCR *);
+size_t v_key_len(SCR *, ARG_CHAR_T);
+CHAR_T *v_key_name(SCR *, ARG_CHAR_T);
+int v_key_val(SCR *, ARG_CHAR_T);
+int v_event_push(SCR *, EVENT *, CHAR_T *, size_t, u_int);
+int v_event_get(SCR *, EVENT *, int, u_int32_t);
+void v_event_err(SCR *, EVENT *);
+int v_event_flush(SCR *, u_int);
+int db_eget(SCR *, recno_t, char **, size_t *, int *);
+int db_get(SCR *, recno_t, u_int32_t, char **, size_t *);
+int db_delete(SCR *, recno_t);
+int db_append(SCR *, int, recno_t, char *, size_t);
+int db_insert(SCR *, recno_t, char *, size_t);
+int db_set(SCR *, recno_t, char *, size_t);
+int db_exist(SCR *, recno_t);
+int db_last(SCR *, recno_t *);
+void db_err(SCR *, recno_t);
+int log_init(SCR *, EXF *);
+int log_end(SCR *, EXF *);
+int log_cursor(SCR *);
+int log_line(SCR *, recno_t, u_int);
+int log_mark(SCR *, LMARK *);
+int log_backward(SCR *, MARK *);
+int log_setline(SCR *);
+int log_forward(SCR *, MARK *);
+int editor(GS *, int, char *[]);
+void v_end(GS *);
+int mark_init(SCR *, EXF *);
+int mark_end(SCR *, EXF *);
+int mark_get(SCR *, ARG_CHAR_T, MARK *, mtype_t);
+int mark_set(SCR *, ARG_CHAR_T, MARK *, int);
+int mark_insdel(SCR *, lnop_t, recno_t);
+void msgq(SCR *, mtype_t, const char *, ...);
+void msgq_str(SCR *, mtype_t, char *, char *);
+void mod_rpt(SCR *);
+void msgq_status(SCR *, recno_t, u_int);
+int msg_open(SCR *, char *);
+void msg_close(GS *);
+const char *msg_cmsg(SCR *, cmsg_t, size_t *);
+const char *msg_cat(SCR *, const char *, size_t *);
+char *msg_print(SCR *, const char *, int *);
+int opts_init(SCR *, int *);
+int opts_set(SCR *, ARGS *[], char *);
+int o_set(SCR *, int, u_int, char *, u_long);
+int opts_empty(SCR *, int, int);
+void opts_dump(SCR *, enum optdisp);
+int opts_save(SCR *, FILE *);
+OPTLIST const *opts_search(char *);
+void opts_nomatch(SCR *, char *);
+int opts_copy(SCR *, SCR *);
+void opts_free(SCR *);
+int f_altwerase(SCR *, OPTION *, char *, u_long *);
+int f_columns(SCR *, OPTION *, char *, u_long *);
+int f_lines(SCR *, OPTION *, char *, u_long *);
+int f_lisp(SCR *, OPTION *, char *, u_long *);
+int f_msgcat(SCR *, OPTION *, char *, u_long *);
+int f_paragraph(SCR *, OPTION *, char *, u_long *);
+int f_print(SCR *, OPTION *, char *, u_long *);
+int f_readonly(SCR *, OPTION *, char *, u_long *);
+int f_recompile(SCR *, OPTION *, char *, u_long *);
+int f_reformat(SCR *, OPTION *, char *, u_long *);
+int f_section(SCR *, OPTION *, char *, u_long *);
+int f_ttywerase(SCR *, OPTION *, char *, u_long *);
+int f_w300(SCR *, OPTION *, char *, u_long *);
+int f_w1200(SCR *, OPTION *, char *, u_long *);
+int f_w9600(SCR *, OPTION *, char *, u_long *);
+int f_window(SCR *, OPTION *, char *, u_long *);
+int put(SCR *, CB *, CHAR_T *, MARK *, MARK *, int);
+int rcv_tmp(SCR *, EXF *, char *);
+int rcv_init(SCR *);
+int rcv_sync(SCR *, u_int);
+int rcv_list(SCR *);
+int rcv_read(SCR *, FREF *);
+int screen_init(GS *, SCR *, SCR **);
+int screen_end(SCR *);
+SCR *screen_next(SCR *);
 int f_search __P((SCR *,
    MARK *, MARK *, char *, size_t, char **, u_int));
 int b_search __P((SCR *,
    MARK *, MARK *, char *, size_t, char **, u_int));
-void search_busy __P((SCR *, busy_t));
+void search_busy(SCR *, busy_t);
 int seq_set __P((SCR *, CHAR_T *,
    size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int));
-int seq_delete __P((SCR *, CHAR_T *, size_t, seq_t));
-int seq_mdel __P((SEQ *));
+int seq_delete(SCR *, CHAR_T *, size_t, seq_t);
+int seq_mdel(SEQ *);
 SEQ *seq_find
-   __P((SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *));
-void seq_close __P((GS *));
-int seq_dump __P((SCR *, seq_t, int));
-int seq_save __P((SCR *, FILE *, char *, seq_t));
-int e_memcmp __P((CHAR_T *, EVENT *, size_t));
-void *binc __P((SCR *, void *, size_t *, size_t));
-int nonblank __P((SCR *, recno_t, size_t *));
-char *tail __P((char *));
-CHAR_T *v_strdup __P((SCR *, const CHAR_T *, size_t));
-enum nresult nget_uslong __P((u_long *, const char *, char **, int));
-enum nresult nget_slong __P((long *, const char *, char **, int));
-void TRACE __P((SCR *, const char *, ...));
+(SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *);
+void seq_close(GS *);
+int seq_dump(SCR *, seq_t, int);
+int seq_save(SCR *, FILE *, char *, seq_t);
+int e_memcmp(CHAR_T *, EVENT *, size_t);
+void *binc(SCR *, void *, size_t *, size_t);
+int nonblank(SCR *, recno_t, size_t *);
+char *tail(char *);
+CHAR_T *v_strdup(SCR *, const CHAR_T *, size_t);
+enum nresult nget_uslong(u_long *, const char *, char **, int);
+enum nresult nget_slong(long *, const char *, char **, int);
+void TRACE(SCR *, const char *, ...);
diff --git a/usr.bin/vi/include/ex_extern.h b/usr.bin/vi/include/ex_extern.h
index 8bdc9de7c25..9372d714eda 100644
--- a/usr.bin/vi/include/ex_extern.h
+++ b/usr.bin/vi/include/ex_extern.h
@@ -1,129 +1,129 @@
-/*	$OpenBSD: ex_extern.h,v 1.5 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: ex_extern.h,v 1.6 2002/02/16 21:27:58 millert Exp $	*/
 
-int ex __P((SCR **));
-int ex_cmd __P((SCR *));
-int ex_range __P((SCR *, EXCMD *, int *));
-int ex_is_abbrev __P((char *, size_t));
-int ex_is_unmap __P((char *, size_t));
+int ex(SCR **);
+int ex_cmd(SCR *);
+int ex_range(SCR *, EXCMD *, int *);
+int ex_is_abbrev(char *, size_t);
+int ex_is_unmap(char *, size_t);
 void ex_badaddr
-   __P((SCR *, EXCMDLIST const *, enum badaddr, enum nresult));
-int ex_abbr __P((SCR *, EXCMD *));
-int ex_unabbr __P((SCR *, EXCMD *));
-int ex_append __P((SCR *, EXCMD *));
-int ex_change __P((SCR *, EXCMD *));
-int ex_insert __P((SCR *, EXCMD *));
-int ex_next __P((SCR *, EXCMD *));
-int ex_prev __P((SCR *, EXCMD *));
-int ex_rew __P((SCR *, EXCMD *));
-int ex_args __P((SCR *, EXCMD *));
-char **ex_buildargv __P((SCR *, EXCMD *, char *));
-int argv_init __P((SCR *, EXCMD *));
-int argv_exp0 __P((SCR *, EXCMD *, char *, size_t));
-int argv_exp1 __P((SCR *, EXCMD *, char *, size_t, int));
-int argv_exp2 __P((SCR *, EXCMD *, char *, size_t));
-int argv_exp3 __P((SCR *, EXCMD *, char *, size_t));
-int argv_free __P((SCR *));
-int ex_at __P((SCR *, EXCMD *));
-int ex_bang __P((SCR *, EXCMD *));
-int ex_cd __P((SCR *, EXCMD *));
-int ex_cscope __P((SCR *, EXCMD *));
-int cscope_display __P((SCR *));
-int cscope_search __P((SCR *, TAGQ *, TAG *));
-int ex_delete __P((SCR *, EXCMD *));
-int ex_display __P((SCR *, EXCMD *));
-int ex_edit __P((SCR *, EXCMD *));
-int ex_equal __P((SCR *, EXCMD *));
-int ex_file __P((SCR *, EXCMD *));
+(SCR *, EXCMDLIST const *, enum badaddr, enum nresult);
+int ex_abbr(SCR *, EXCMD *);
+int ex_unabbr(SCR *, EXCMD *);
+int ex_append(SCR *, EXCMD *);
+int ex_change(SCR *, EXCMD *);
+int ex_insert(SCR *, EXCMD *);
+int ex_next(SCR *, EXCMD *);
+int ex_prev(SCR *, EXCMD *);
+int ex_rew(SCR *, EXCMD *);
+int ex_args(SCR *, EXCMD *);
+char **ex_buildargv(SCR *, EXCMD *, char *);
+int argv_init(SCR *, EXCMD *);
+int argv_exp0(SCR *, EXCMD *, char *, size_t);
+int argv_exp1(SCR *, EXCMD *, char *, size_t, int);
+int argv_exp2(SCR *, EXCMD *, char *, size_t);
+int argv_exp3(SCR *, EXCMD *, char *, size_t);
+int argv_free(SCR *);
+int ex_at(SCR *, EXCMD *);
+int ex_bang(SCR *, EXCMD *);
+int ex_cd(SCR *, EXCMD *);
+int ex_cscope(SCR *, EXCMD *);
+int cscope_display(SCR *);
+int cscope_search(SCR *, TAGQ *, TAG *);
+int ex_delete(SCR *, EXCMD *);
+int ex_display(SCR *, EXCMD *);
+int ex_edit(SCR *, EXCMD *);
+int ex_equal(SCR *, EXCMD *);
+int ex_file(SCR *, EXCMD *);
 int ex_filter __P((SCR *, 
    EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype));
-int ex_global __P((SCR *, EXCMD *));
-int ex_v __P((SCR *, EXCMD *));
-int ex_g_insdel __P((SCR *, lnop_t, recno_t));
-int ex_screen_copy __P((SCR *, SCR *));
-int ex_screen_end __P((SCR *));
-int ex_optchange __P((SCR *, int, char *, u_long *));
-int ex_exrc __P((SCR *));
-int ex_run_str __P((SCR *, char *, char *, size_t, int, int));
-int ex_join __P((SCR *, EXCMD *));
-int ex_map __P((SCR *, EXCMD *));
-int ex_unmap __P((SCR *, EXCMD *));
-int ex_mark __P((SCR *, EXCMD *));
-int ex_mkexrc __P((SCR *, EXCMD *));
-int ex_copy __P((SCR *, EXCMD *));
-int ex_move __P((SCR *, EXCMD *));
-int ex_open __P((SCR *, EXCMD *));
-int ex_perl __P((SCR*, EXCMD *));
-int ex_preserve __P((SCR *, EXCMD *));
-int ex_recover __P((SCR *, EXCMD *));
-int ex_list __P((SCR *, EXCMD *));
-int ex_number __P((SCR *, EXCMD *));
-int ex_pr __P((SCR *, EXCMD *));
-int ex_print __P((SCR *, EXCMD *, MARK *, MARK *, u_int32_t));
-int ex_ldisplay __P((SCR *, const char *, size_t, size_t, u_int));
-int ex_scprint __P((SCR *, MARK *, MARK *));
-int ex_printf __P((SCR *, const char *, ...));
-int ex_puts __P((SCR *, const char *));
-int ex_fflush __P((SCR *sp));
-int ex_put __P((SCR *, EXCMD *));
-int ex_quit __P((SCR *, EXCMD *));
-int ex_read __P((SCR *, EXCMD *));
-int ex_readfp __P((SCR *, char *, FILE *, MARK *, recno_t *, int));
-int ex_bg __P((SCR *, EXCMD *));
-int ex_fg __P((SCR *, EXCMD *));
-int ex_resize __P((SCR *, EXCMD *));
-int ex_sdisplay __P((SCR *));
-int ex_script __P((SCR *, EXCMD *));
-int sscr_exec __P((SCR *, recno_t));
-int sscr_input __P((SCR *));
-int sscr_end __P((SCR *));
-int ex_set __P((SCR *, EXCMD *));
-int ex_shell __P((SCR *, EXCMD *));
-int ex_exec_proc __P((SCR *, EXCMD *, char *, const char *, int));
-int proc_wait __P((SCR *, long, const char *, int, int));
-int ex_shiftl __P((SCR *, EXCMD *));
-int ex_shiftr __P((SCR *, EXCMD *));
-int ex_source __P((SCR *, EXCMD *));
-int ex_stop __P((SCR *, EXCMD *));
-int ex_s __P((SCR *, EXCMD *));
-int ex_subagain __P((SCR *, EXCMD *));
-int ex_subtilde __P((SCR *, EXCMD *));
+int ex_global(SCR *, EXCMD *);
+int ex_v(SCR *, EXCMD *);
+int ex_g_insdel(SCR *, lnop_t, recno_t);
+int ex_screen_copy(SCR *, SCR *);
+int ex_screen_end(SCR *);
+int ex_optchange(SCR *, int, char *, u_long *);
+int ex_exrc(SCR *);
+int ex_run_str(SCR *, char *, char *, size_t, int, int);
+int ex_join(SCR *, EXCMD *);
+int ex_map(SCR *, EXCMD *);
+int ex_unmap(SCR *, EXCMD *);
+int ex_mark(SCR *, EXCMD *);
+int ex_mkexrc(SCR *, EXCMD *);
+int ex_copy(SCR *, EXCMD *);
+int ex_move(SCR *, EXCMD *);
+int ex_open(SCR *, EXCMD *);
+int ex_perl(SCR*, EXCMD *);
+int ex_preserve(SCR *, EXCMD *);
+int ex_recover(SCR *, EXCMD *);
+int ex_list(SCR *, EXCMD *);
+int ex_number(SCR *, EXCMD *);
+int ex_pr(SCR *, EXCMD *);
+int ex_print(SCR *, EXCMD *, MARK *, MARK *, u_int32_t);
+int ex_ldisplay(SCR *, const char *, size_t, size_t, u_int);
+int ex_scprint(SCR *, MARK *, MARK *);
+int ex_printf(SCR *, const char *, ...);
+int ex_puts(SCR *, const char *);
+int ex_fflush(SCR *sp);
+int ex_put(SCR *, EXCMD *);
+int ex_quit(SCR *, EXCMD *);
+int ex_read(SCR *, EXCMD *);
+int ex_readfp(SCR *, char *, FILE *, MARK *, recno_t *, int);
+int ex_bg(SCR *, EXCMD *);
+int ex_fg(SCR *, EXCMD *);
+int ex_resize(SCR *, EXCMD *);
+int ex_sdisplay(SCR *);
+int ex_script(SCR *, EXCMD *);
+int sscr_exec(SCR *, recno_t);
+int sscr_input(SCR *);
+int sscr_end(SCR *);
+int ex_set(SCR *, EXCMD *);
+int ex_shell(SCR *, EXCMD *);
+int ex_exec_proc(SCR *, EXCMD *, char *, const char *, int);
+int proc_wait(SCR *, long, const char *, int, int);
+int ex_shiftl(SCR *, EXCMD *);
+int ex_shiftr(SCR *, EXCMD *);
+int ex_source(SCR *, EXCMD *);
+int ex_stop(SCR *, EXCMD *);
+int ex_s(SCR *, EXCMD *);
+int ex_subagain(SCR *, EXCMD *);
+int ex_subtilde(SCR *, EXCMD *);
 int re_compile __P((SCR *,
     char *, size_t, char **, size_t *, regex_t *, u_int));
-void re_error __P((SCR *, int, regex_t *));
-int ex_tag_first __P((SCR *, char *));
-int ex_tag_push __P((SCR *, EXCMD *));
-int ex_tag_next __P((SCR *, EXCMD *));
-int ex_tag_prev __P((SCR *, EXCMD *));
-int ex_tag_nswitch __P((SCR *, TAG *, int));
-int ex_tag_Nswitch __P((SCR *, TAG *, int));
-int ex_tag_pop __P((SCR *, EXCMD *));
-int ex_tag_top __P((SCR *, EXCMD *));
-int ex_tag_display __P((SCR *));
-int ex_tag_copy __P((SCR *, SCR *));
-int tagq_free __P((SCR *, TAGQ *));
-void tag_msg __P((SCR *, tagmsg_t, char *));
-int ex_tagf_alloc __P((SCR *, char *));
-int ex_tag_free __P((SCR *));
-int ex_tcl __P((SCR*, EXCMD *));
-int ex_txt __P((SCR *, TEXTH *, ARG_CHAR_T, u_int32_t));
-int ex_undo __P((SCR *, EXCMD *));
-int ex_help __P((SCR *, EXCMD *));
-int ex_usage __P((SCR *, EXCMD *));
-int ex_viusage __P((SCR *, EXCMD *));
+void re_error(SCR *, int, regex_t *);
+int ex_tag_first(SCR *, char *);
+int ex_tag_push(SCR *, EXCMD *);
+int ex_tag_next(SCR *, EXCMD *);
+int ex_tag_prev(SCR *, EXCMD *);
+int ex_tag_nswitch(SCR *, TAG *, int);
+int ex_tag_Nswitch(SCR *, TAG *, int);
+int ex_tag_pop(SCR *, EXCMD *);
+int ex_tag_top(SCR *, EXCMD *);
+int ex_tag_display(SCR *);
+int ex_tag_copy(SCR *, SCR *);
+int tagq_free(SCR *, TAGQ *);
+void tag_msg(SCR *, tagmsg_t, char *);
+int ex_tagf_alloc(SCR *, char *);
+int ex_tag_free(SCR *);
+int ex_tcl(SCR*, EXCMD *);
+int ex_txt(SCR *, TEXTH *, ARG_CHAR_T, u_int32_t);
+int ex_undo(SCR *, EXCMD *);
+int ex_help(SCR *, EXCMD *);
+int ex_usage(SCR *, EXCMD *);
+int ex_viusage(SCR *, EXCMD *);
 void ex_cinit __P((EXCMD *,
    int, int, recno_t, recno_t, int, ARGS **));
-void ex_cadd __P((EXCMD *, ARGS *, char *, size_t));
-int ex_getline __P((SCR *, FILE *, size_t *));
-int ex_ncheck __P((SCR *, int));
-int ex_init __P((SCR *));
-void ex_emsg __P((SCR *, char *, exm_t));
-int ex_version __P((SCR *, EXCMD *));
-int ex_visual __P((SCR *, EXCMD *));
-int ex_wn __P((SCR *, EXCMD *));
-int ex_wq __P((SCR *, EXCMD *));
-int ex_write __P((SCR *, EXCMD *));
-int ex_xit __P((SCR *, EXCMD *));
+void ex_cadd(EXCMD *, ARGS *, char *, size_t);
+int ex_getline(SCR *, FILE *, size_t *);
+int ex_ncheck(SCR *, int);
+int ex_init(SCR *);
+void ex_emsg(SCR *, char *, exm_t);
+int ex_version(SCR *, EXCMD *);
+int ex_visual(SCR *, EXCMD *);
+int ex_wn(SCR *, EXCMD *);
+int ex_wq(SCR *, EXCMD *);
+int ex_write(SCR *, EXCMD *);
+int ex_xit(SCR *, EXCMD *);
 int ex_writefp __P((SCR *,
    char *, FILE *, MARK *, MARK *, u_long *, u_long *, int));
-int ex_yank __P((SCR *, EXCMD *));
-int ex_z __P((SCR *, EXCMD *));
+int ex_yank(SCR *, EXCMD *);
+int ex_z(SCR *, EXCMD *);
diff --git a/usr.bin/vi/include/ip_extern.h b/usr.bin/vi/include/ip_extern.h
index 15a45d96bdb..fcb5d124ecb 100644
--- a/usr.bin/vi/include/ip_extern.h
+++ b/usr.bin/vi/include/ip_extern.h
@@ -1,25 +1,25 @@
-/*	$OpenBSD: ip_extern.h,v 1.2 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: ip_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $	*/
 
-int ip_addstr __P((SCR *, const char *, size_t));
-int ip_attr __P((SCR *, scr_attr_t, int));
-int ip_baud __P((SCR *, u_long *));
-int ip_bell __P((SCR *));
-void ip_busy __P((SCR *, const char *, busy_t));
-int ip_clrtoeol __P((SCR *));
-int ip_cursor __P((SCR *, size_t *, size_t *));
-int ip_deleteln __P((SCR *));
-int ip_ex_adjust __P((SCR *, exadj_t));
-int ip_insertln __P((SCR *));
-int ip_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
-int ip_move __P((SCR *, size_t, size_t));
-int ip_refresh __P((SCR *, int));
-int ip_rename __P((SCR *));
-int ip_suspend __P((SCR *, int *));
-void ip_usage __P((void));
-int ip_event __P((SCR *, EVENT *, u_int32_t, int));
-int ip_screen __P((SCR *, u_int32_t));
-int ip_quit __P((GS *));
-int ip_term_init __P((SCR *));
-int ip_term_end __P((GS *));
-int ip_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
-int ip_optchange __P((SCR *, int, char *, u_long *));
+int ip_addstr(SCR *, const char *, size_t);
+int ip_attr(SCR *, scr_attr_t, int);
+int ip_baud(SCR *, u_long *);
+int ip_bell(SCR *);
+void ip_busy(SCR *, const char *, busy_t);
+int ip_clrtoeol(SCR *);
+int ip_cursor(SCR *, size_t *, size_t *);
+int ip_deleteln(SCR *);
+int ip_ex_adjust(SCR *, exadj_t);
+int ip_insertln(SCR *);
+int ip_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
+int ip_move(SCR *, size_t, size_t);
+int ip_refresh(SCR *, int);
+int ip_rename(SCR *);
+int ip_suspend(SCR *, int *);
+void ip_usage(void);
+int ip_event(SCR *, EVENT *, u_int32_t, int);
+int ip_screen(SCR *, u_int32_t);
+int ip_quit(GS *);
+int ip_term_init(SCR *);
+int ip_term_end(GS *);
+int ip_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
+int ip_optchange(SCR *, int, char *, u_long *);
diff --git a/usr.bin/vi/include/perl_extern.h b/usr.bin/vi/include/perl_extern.h
index 614abbe622b..b0545440e1f 100644
--- a/usr.bin/vi/include/perl_extern.h
+++ b/usr.bin/vi/include/perl_extern.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: perl_extern.h,v 1.4 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: perl_extern.h,v 1.5 2002/02/16 21:27:58 millert Exp $	*/
 
-int perl_end __P((GS *));
-int perl_init __P((SCR *));
-int perl_screen_end __P((SCR*));
-int perl_ex_perl __P((SCR*, CHAR_T *, size_t, recno_t, recno_t));
-int perl_ex_perldo __P((SCR*, CHAR_T *, size_t, recno_t, recno_t));
+int perl_end(GS *);
+int perl_init(SCR *);
+int perl_screen_end(SCR*);
+int perl_ex_perl(SCR*, CHAR_T *, size_t, recno_t, recno_t);
+int perl_ex_perldo(SCR*, CHAR_T *, size_t, recno_t, recno_t);
 #ifdef USE_SFIO
-Sfdisc_t* sfdcnewnvi __P((SCR*));
+Sfdisc_t* sfdcnewnvi(SCR*);
 #endif
diff --git a/usr.bin/vi/include/tcl_extern.h b/usr.bin/vi/include/tcl_extern.h
index 073b878f4a2..c7fe2724f64 100644
--- a/usr.bin/vi/include/tcl_extern.h
+++ b/usr.bin/vi/include/tcl_extern.h
@@ -1,3 +1,3 @@
-/*	$OpenBSD: tcl_extern.h,v 1.2 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: tcl_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $	*/
 
-int tcl_init __P((GS *));
+int tcl_init(GS *);
diff --git a/usr.bin/vi/include/tk_extern.h b/usr.bin/vi/include/tk_extern.h
index 8e4de1f7d70..6a697df4eb2 100644
--- a/usr.bin/vi/include/tk_extern.h
+++ b/usr.bin/vi/include/tk_extern.h
@@ -1,31 +1,31 @@
-/*	$OpenBSD: tk_extern.h,v 1.2 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: tk_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $	*/
 
-int tk_addstr __P((SCR *, const char *, size_t));
-int tk_attr __P((SCR *, scr_attr_t, int));
-int tk_baud __P((SCR *, u_long *));
-int tk_bell __P((SCR *));
-int tk_clrtoeol __P((SCR *));
-int tk_cursor __P((SCR *, size_t *, size_t *));
-int tk_deleteln __P((SCR *));
-int tk_ex_adjust __P((SCR *, exadj_t));
-int tk_insertln __P((SCR *));
-int tk_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
-int tk_move __P((SCR *, size_t, size_t));
-int tk_refresh __P((SCR *, int));
-int tk_rename __P((SCR *));
-int tk_suspend __P((SCR *, int *));
-void tk_usage __P((void));
-int tk_event __P((SCR *, EVENT *, u_int32_t, int));
-int tk_key __P((ClientData, Tcl_Interp *, int, char *[]));
-int tk_screen __P((SCR *, u_int32_t));
-int tk_quit __P((GS *));
-int tk_term_init __P((SCR *));
-int tk_term_end __P((GS *));
-int tk_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
-int tk_optchange __P((SCR *, int, char *, u_long *));
-int tk_ssize __P((SCR *, int, size_t *, size_t *, int *));
-int tk_op __P((ClientData, Tcl_Interp *, int, char *[]));
-int tk_opt_init __P((ClientData, Tcl_Interp *, int, char *[]));
-int tk_opt_set __P((ClientData, Tcl_Interp *, int, char *[]));
-int tk_version __P((ClientData, Tcl_Interp *, int, char *[]));
-void tk_msg __P((SCR *, mtype_t, char *, size_t));
+int tk_addstr(SCR *, const char *, size_t);
+int tk_attr(SCR *, scr_attr_t, int);
+int tk_baud(SCR *, u_long *);
+int tk_bell(SCR *);
+int tk_clrtoeol(SCR *);
+int tk_cursor(SCR *, size_t *, size_t *);
+int tk_deleteln(SCR *);
+int tk_ex_adjust(SCR *, exadj_t);
+int tk_insertln(SCR *);
+int tk_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
+int tk_move(SCR *, size_t, size_t);
+int tk_refresh(SCR *, int);
+int tk_rename(SCR *);
+int tk_suspend(SCR *, int *);
+void tk_usage(void);
+int tk_event(SCR *, EVENT *, u_int32_t, int);
+int tk_key(ClientData, Tcl_Interp *, int, char *[]);
+int tk_screen(SCR *, u_int32_t);
+int tk_quit(GS *);
+int tk_term_init(SCR *);
+int tk_term_end(GS *);
+int tk_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
+int tk_optchange(SCR *, int, char *, u_long *);
+int tk_ssize(SCR *, int, size_t *, size_t *, int *);
+int tk_op(ClientData, Tcl_Interp *, int, char *[]);
+int tk_opt_init(ClientData, Tcl_Interp *, int, char *[]);
+int tk_opt_set(ClientData, Tcl_Interp *, int, char *[]);
+int tk_version(ClientData, Tcl_Interp *, int, char *[]);
+void tk_msg(SCR *, mtype_t, char *, size_t);
diff --git a/usr.bin/vi/include/vi_extern.h b/usr.bin/vi/include/vi_extern.h
index c327568ecb0..ebc1d721a62 100644
--- a/usr.bin/vi/include/vi_extern.h
+++ b/usr.bin/vi/include/vi_extern.h
@@ -1,144 +1,144 @@
-/*	$OpenBSD: vi_extern.h,v 1.6 2001/01/29 01:58:48 niklas Exp $	*/
+/*	$OpenBSD: vi_extern.h,v 1.7 2002/02/16 21:27:58 millert Exp $	*/
 
-int cs_init __P((SCR *, VCS *));
-int cs_next __P((SCR *, VCS *));
-int cs_fspace __P((SCR *, VCS *));
-int cs_fblank __P((SCR *, VCS *));
-int cs_prev __P((SCR *, VCS *));
-int cs_bblank __P((SCR *, VCS *));
-int v_at __P((SCR *, VICMD *));
-int v_chrepeat __P((SCR *, VICMD *));
-int v_chrrepeat __P((SCR *, VICMD *));
-int v_cht __P((SCR *, VICMD *));
-int v_chf __P((SCR *, VICMD *));
-int v_chT __P((SCR *, VICMD *));
-int v_chF __P((SCR *, VICMD *));
-int v_delete __P((SCR *, VICMD *));
-int v_again __P((SCR *, VICMD *));
-int v_exmode __P((SCR *, VICMD *));
-int v_join __P((SCR *, VICMD *));
-int v_shiftl __P((SCR *, VICMD *));
-int v_shiftr __P((SCR *, VICMD *));
-int v_suspend __P((SCR *, VICMD *));
-int v_switch __P((SCR *, VICMD *));
-int v_tagpush __P((SCR *, VICMD *));
-int v_tagpop __P((SCR *, VICMD *));
-int v_filter __P((SCR *, VICMD *));
-int v_event_exec __P((SCR *, VICMD *));
-int v_ex __P((SCR *, VICMD *));
-int v_ecl_exec __P((SCR *));
-int v_increment __P((SCR *, VICMD *));
-int v_screen_copy __P((SCR *, SCR *));
-int v_screen_end __P((SCR *));
-int v_optchange __P((SCR *, int, char *, u_long *));
-int v_iA __P((SCR *, VICMD *));
-int v_ia __P((SCR *, VICMD *));
-int v_iI __P((SCR *, VICMD *));
-int v_ii __P((SCR *, VICMD *));
-int v_iO __P((SCR *, VICMD *));
-int v_io __P((SCR *, VICMD *));
-int v_change __P((SCR *, VICMD *));
-int v_Replace __P((SCR *, VICMD *));
-int v_subst __P((SCR *, VICMD *));
-int v_left __P((SCR *, VICMD *));
-int v_cfirst __P((SCR *, VICMD *));
-int v_first __P((SCR *, VICMD *));
-int v_ncol __P((SCR *, VICMD *));
-int v_zero __P((SCR *, VICMD *));
-int v_mark __P((SCR *, VICMD *));
-int v_bmark __P((SCR *, VICMD *));
-int v_fmark __P((SCR *, VICMD *));
-int v_match __P((SCR *, VICMD *));
-int v_paragraphf __P((SCR *, VICMD *));
-int v_paragraphb __P((SCR *, VICMD *));
-int v_buildps __P((SCR *, char *, char *));
-int v_Put __P((SCR *, VICMD *));
-int v_put __P((SCR *, VICMD *));
-int v_redraw __P((SCR *, VICMD *));
-int v_replace __P((SCR *, VICMD *));
-int v_right __P((SCR *, VICMD *));
-int v_dollar __P((SCR *, VICMD *));
-int v_screen __P((SCR *, VICMD *));
-int v_lgoto __P((SCR *, VICMD *));
-int v_home __P((SCR *, VICMD *));
-int v_middle __P((SCR *, VICMD *));
-int v_bottom __P((SCR *, VICMD *));
-int v_up __P((SCR *, VICMD *));
-int v_cr __P((SCR *, VICMD *));
-int v_down __P((SCR *, VICMD *));
-int v_hpageup __P((SCR *, VICMD *));
-int v_hpagedown __P((SCR *, VICMD *));
-int v_pagedown __P((SCR *, VICMD *));
-int v_pageup __P((SCR *, VICMD *));
-int v_lineup __P((SCR *, VICMD *));
-int v_linedown __P((SCR *, VICMD *));
-int v_searchb __P((SCR *, VICMD *));
-int v_searchf __P((SCR *, VICMD *));
-int v_searchN __P((SCR *, VICMD *));
-int v_searchn __P((SCR *, VICMD *));
-int v_searchw __P((SCR *, VICMD *));
-int v_correct __P((SCR *, VICMD *, int));
-int v_sectionf __P((SCR *, VICMD *));
-int v_sectionb __P((SCR *, VICMD *));
-int v_sentencef __P((SCR *, VICMD *));
-int v_sentenceb __P((SCR *, VICMD *));
-int v_status __P((SCR *, VICMD *));
-int v_tcmd __P((SCR *, VICMD *, ARG_CHAR_T, u_int));
+int cs_init(SCR *, VCS *);
+int cs_next(SCR *, VCS *);
+int cs_fspace(SCR *, VCS *);
+int cs_fblank(SCR *, VCS *);
+int cs_prev(SCR *, VCS *);
+int cs_bblank(SCR *, VCS *);
+int v_at(SCR *, VICMD *);
+int v_chrepeat(SCR *, VICMD *);
+int v_chrrepeat(SCR *, VICMD *);
+int v_cht(SCR *, VICMD *);
+int v_chf(SCR *, VICMD *);
+int v_chT(SCR *, VICMD *);
+int v_chF(SCR *, VICMD *);
+int v_delete(SCR *, VICMD *);
+int v_again(SCR *, VICMD *);
+int v_exmode(SCR *, VICMD *);
+int v_join(SCR *, VICMD *);
+int v_shiftl(SCR *, VICMD *);
+int v_shiftr(SCR *, VICMD *);
+int v_suspend(SCR *, VICMD *);
+int v_switch(SCR *, VICMD *);
+int v_tagpush(SCR *, VICMD *);
+int v_tagpop(SCR *, VICMD *);
+int v_filter(SCR *, VICMD *);
+int v_event_exec(SCR *, VICMD *);
+int v_ex(SCR *, VICMD *);
+int v_ecl_exec(SCR *);
+int v_increment(SCR *, VICMD *);
+int v_screen_copy(SCR *, SCR *);
+int v_screen_end(SCR *);
+int v_optchange(SCR *, int, char *, u_long *);
+int v_iA(SCR *, VICMD *);
+int v_ia(SCR *, VICMD *);
+int v_iI(SCR *, VICMD *);
+int v_ii(SCR *, VICMD *);
+int v_iO(SCR *, VICMD *);
+int v_io(SCR *, VICMD *);
+int v_change(SCR *, VICMD *);
+int v_Replace(SCR *, VICMD *);
+int v_subst(SCR *, VICMD *);
+int v_left(SCR *, VICMD *);
+int v_cfirst(SCR *, VICMD *);
+int v_first(SCR *, VICMD *);
+int v_ncol(SCR *, VICMD *);
+int v_zero(SCR *, VICMD *);
+int v_mark(SCR *, VICMD *);
+int v_bmark(SCR *, VICMD *);
+int v_fmark(SCR *, VICMD *);
+int v_match(SCR *, VICMD *);
+int v_paragraphf(SCR *, VICMD *);
+int v_paragraphb(SCR *, VICMD *);
+int v_buildps(SCR *, char *, char *);
+int v_Put(SCR *, VICMD *);
+int v_put(SCR *, VICMD *);
+int v_redraw(SCR *, VICMD *);
+int v_replace(SCR *, VICMD *);
+int v_right(SCR *, VICMD *);
+int v_dollar(SCR *, VICMD *);
+int v_screen(SCR *, VICMD *);
+int v_lgoto(SCR *, VICMD *);
+int v_home(SCR *, VICMD *);
+int v_middle(SCR *, VICMD *);
+int v_bottom(SCR *, VICMD *);
+int v_up(SCR *, VICMD *);
+int v_cr(SCR *, VICMD *);
+int v_down(SCR *, VICMD *);
+int v_hpageup(SCR *, VICMD *);
+int v_hpagedown(SCR *, VICMD *);
+int v_pagedown(SCR *, VICMD *);
+int v_pageup(SCR *, VICMD *);
+int v_lineup(SCR *, VICMD *);
+int v_linedown(SCR *, VICMD *);
+int v_searchb(SCR *, VICMD *);
+int v_searchf(SCR *, VICMD *);
+int v_searchN(SCR *, VICMD *);
+int v_searchn(SCR *, VICMD *);
+int v_searchw(SCR *, VICMD *);
+int v_correct(SCR *, VICMD *, int);
+int v_sectionf(SCR *, VICMD *);
+int v_sectionb(SCR *, VICMD *);
+int v_sentencef(SCR *, VICMD *);
+int v_sentenceb(SCR *, VICMD *);
+int v_status(SCR *, VICMD *);
+int v_tcmd(SCR *, VICMD *, ARG_CHAR_T, u_int);
 int v_txt __P((SCR *, VICMD *, MARK *,
    const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t));
-int v_txt_auto __P((SCR *, recno_t, TEXT *, size_t, TEXT *));
-int v_ulcase __P((SCR *, VICMD *));
-int v_mulcase __P((SCR *, VICMD *));
-int v_Undo __P((SCR *, VICMD *));
-int v_undo __P((SCR *, VICMD *));
-void v_eof __P((SCR *, MARK *));
-void v_eol __P((SCR *, MARK *));
-void v_nomove __P((SCR *));
-void v_sof __P((SCR *, MARK *));
-void v_sol __P((SCR *));
-int v_isempty __P((char *, size_t));
-void v_emsg __P((SCR *, char *, vim_t));
-int v_wordW __P((SCR *, VICMD *));
-int v_wordw __P((SCR *, VICMD *));
-int v_wordE __P((SCR *, VICMD *));
-int v_worde __P((SCR *, VICMD *));
-int v_wordB __P((SCR *, VICMD *));
-int v_wordb __P((SCR *, VICMD *));
-int v_xchar __P((SCR *, VICMD *));
-int v_Xchar __P((SCR *, VICMD *));
-int v_yank __P((SCR *, VICMD *));
-int v_z __P((SCR *, VICMD *));
-int vs_crel __P((SCR *, long));
-int v_zexit __P((SCR *, VICMD *));
-int vi __P((SCR **));
-int vs_line __P((SCR *, SMAP *, size_t *, size_t *));
-int vs_number __P((SCR *));
-void vs_busy __P((SCR *, const char *, busy_t));
-void vs_home __P((SCR *));
-void vs_update __P((SCR *, const char *, const char *));
-void vs_msg __P((SCR *, mtype_t, char *, size_t));
-int vs_ex_resolve __P((SCR *, int *));
-int vs_resolve __P((SCR *, SCR *, int));
-int vs_repaint __P((SCR *, EVENT *));
-int vs_refresh __P((SCR *, int));
-int vs_column __P((SCR *, size_t *));
-size_t vs_screens __P((SCR *, recno_t, size_t *));
-size_t vs_columns __P((SCR *, char *, recno_t, size_t *, size_t *));
-size_t vs_rcm __P((SCR *, recno_t, int));
-size_t vs_colpos __P((SCR *, recno_t, size_t));
-int vs_change __P((SCR *, recno_t, lnop_t));
-int vs_sm_fill __P((SCR *, recno_t, pos_t));
-int vs_sm_scroll __P((SCR *, MARK *, recno_t, scroll_t));
-int vs_sm_1up __P((SCR *));
-int vs_sm_1down __P((SCR *));
-int vs_sm_next __P((SCR *, SMAP *, SMAP *));
-int vs_sm_prev __P((SCR *, SMAP *, SMAP *));
-int vs_sm_cursor __P((SCR *, SMAP **));
-int vs_sm_position __P((SCR *, MARK *, u_long, pos_t));
-recno_t vs_sm_nlines __P((SCR *, SMAP *, recno_t, size_t));
-int vs_split __P((SCR *, SCR *, int));
-int vs_discard __P((SCR *, SCR **));
-int vs_fg __P((SCR *, SCR **, CHAR_T *, int));
-int vs_bg __P((SCR *));
-int vs_swap __P((SCR *, SCR **, char *));
-int vs_resize __P((SCR *, long, adj_t));
+int v_txt_auto(SCR *, recno_t, TEXT *, size_t, TEXT *);
+int v_ulcase(SCR *, VICMD *);
+int v_mulcase(SCR *, VICMD *);
+int v_Undo(SCR *, VICMD *);
+int v_undo(SCR *, VICMD *);
+void v_eof(SCR *, MARK *);
+void v_eol(SCR *, MARK *);
+void v_nomove(SCR *);
+void v_sof(SCR *, MARK *);
+void v_sol(SCR *);
+int v_isempty(char *, size_t);
+void v_emsg(SCR *, char *, vim_t);
+int v_wordW(SCR *, VICMD *);
+int v_wordw(SCR *, VICMD *);
+int v_wordE(SCR *, VICMD *);
+int v_worde(SCR *, VICMD *);
+int v_wordB(SCR *, VICMD *);
+int v_wordb(SCR *, VICMD *);
+int v_xchar(SCR *, VICMD *);
+int v_Xchar(SCR *, VICMD *);
+int v_yank(SCR *, VICMD *);
+int v_z(SCR *, VICMD *);
+int vs_crel(SCR *, long);
+int v_zexit(SCR *, VICMD *);
+int vi(SCR **);
+int vs_line(SCR *, SMAP *, size_t *, size_t *);
+int vs_number(SCR *);
+void vs_busy(SCR *, const char *, busy_t);
+void vs_home(SCR *);
+void vs_update(SCR *, const char *, const char *);
+void vs_msg(SCR *, mtype_t, char *, size_t);
+int vs_ex_resolve(SCR *, int *);
+int vs_resolve(SCR *, SCR *, int);
+int vs_repaint(SCR *, EVENT *);
+int vs_refresh(SCR *, int);
+int vs_column(SCR *, size_t *);
+size_t vs_screens(SCR *, recno_t, size_t *);
+size_t vs_columns(SCR *, char *, recno_t, size_t *, size_t *);
+size_t vs_rcm(SCR *, recno_t, int);
+size_t vs_colpos(SCR *, recno_t, size_t);
+int vs_change(SCR *, recno_t, lnop_t);
+int vs_sm_fill(SCR *, recno_t, pos_t);
+int vs_sm_scroll(SCR *, MARK *, recno_t, scroll_t);
+int vs_sm_1up(SCR *);
+int vs_sm_1down(SCR *);
+int vs_sm_next(SCR *, SMAP *, SMAP *);
+int vs_sm_prev(SCR *, SMAP *, SMAP *);
+int vs_sm_cursor(SCR *, SMAP **);
+int vs_sm_position(SCR *, MARK *, u_long, pos_t);
+recno_t vs_sm_nlines(SCR *, SMAP *, recno_t, size_t);
+int vs_split(SCR *, SCR *, int);
+int vs_discard(SCR *, SCR **);
+int vs_fg(SCR *, SCR **, CHAR_T *, int);
+int vs_bg(SCR *);
+int vs_swap(SCR *, SCR **, char *);
+int vs_resize(SCR *, long, adj_t);