aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1197

Browse Source 
Problem:    Still using __ARGS.
Solution:   Remove __ARGS in several files. (script by Hirohito Higashi)
This commit is contained in:
Bram Moolenaar 2016-01-29 22:13:30 +01:00
parent f28dbcea37
commit d25c16e2f2
14 changed files with 314 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ex_eval.c
View File

@ -15,9 +15,9 @@
#if defined(FEAT_EVAL) || defined(PROTO) #if defined(FEAT_EVAL) || defined(PROTO)
static void free_msglist __ARGS((struct msglist *l)); static void free_msglist(struct msglist *l);
static int throw_exception __ARGS((void *, int, char_u *)); static int throw_exception(void *, int, char_u *);
static char_u *get_end_emsg __ARGS((struct condstack *cstack)); static char_u *get_end_emsg(struct condstack *cstack);
/* /*
* Exception handling terms: * Exception handling terms:
@ -65,10 +65,10 @@ static char_u *get_end_emsg __ARGS((struct condstack *cstack));
# define THROW_ON_INTERRUPT_TRUE # define THROW_ON_INTERRUPT_TRUE
#endif #endif
static void catch_exception __ARGS((except_T *excp)); static void catch_exception(except_T *excp);
static void finish_exception __ARGS((except_T *excp)); static void finish_exception(except_T *excp);
static void discard_exception __ARGS((except_T *excp, int was_finished)); static void discard_exception(except_T *excp, int was_finished);
static void report_pending __ARGS((int action, int pending, void *value)); static void report_pending(int action, int pending, void *value);
/* /*
* When several errors appear in a row, setting "force_abort" is delayed until * When several errors appear in a row, setting "force_abort" is delayed until

74
src/ex_getln.c
View File

@ -66,11 +66,11 @@ static int hisnum[HIST_COUNT] = {0, 0, 0, 0, 0};
/* identifying (unique) number of newest history entry */ /* identifying (unique) number of newest history entry */
static int hislen = 0; /* actual length of history tables */ static int hislen = 0; /* actual length of history tables */
static int hist_char2type __ARGS((int c)); static int hist_char2type(int c);
static int in_history __ARGS((int, char_u *, int, int, int)); static int in_history(int, char_u *, int, int, int);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
static int calc_hist_idx __ARGS((int histype, int num)); static int calc_hist_idx(int histype, int num);
# endif # endif
#endif #endif
@ -82,50 +82,50 @@ static int cmd_hkmap = 0; /* Hebrew mapping during command line */
static int cmd_fkmap = 0; /* Farsi mapping during command line */ static int cmd_fkmap = 0; /* Farsi mapping during command line */
#endif #endif
static int cmdline_charsize __ARGS((int idx)); static int cmdline_charsize(int idx);
static void set_cmdspos __ARGS((void)); static void set_cmdspos(void);
static void set_cmdspos_cursor __ARGS((void)); static void set_cmdspos_cursor(void);
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
static void correct_cmdspos __ARGS((int idx, int cells)); static void correct_cmdspos(int idx, int cells);
#endif #endif
static void alloc_cmdbuff __ARGS((int len)); static void alloc_cmdbuff(int len);
static int realloc_cmdbuff __ARGS((int len)); static int realloc_cmdbuff(int len);
static void draw_cmdline __ARGS((int start, int len)); static void draw_cmdline(int start, int len);
static void save_cmdline __ARGS((struct cmdline_info *ccp)); static void save_cmdline(struct cmdline_info *ccp);
static void restore_cmdline __ARGS((struct cmdline_info *ccp)); static void restore_cmdline(struct cmdline_info *ccp);
static int cmdline_paste __ARGS((int regname, int literally, int remcr)); static int cmdline_paste(int regname, int literally, int remcr);
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
static void redrawcmd_preedit __ARGS((void)); static void redrawcmd_preedit(void);
#endif #endif
#ifdef FEAT_WILDMENU #ifdef FEAT_WILDMENU
static void cmdline_del __ARGS((int from)); static void cmdline_del(int from);
#endif #endif
static void redrawcmdprompt __ARGS((void)); static void redrawcmdprompt(void);
static void cursorcmd __ARGS((void)); static void cursorcmd(void);
static int ccheck_abbr __ARGS((int)); static int ccheck_abbr(int);
static int nextwild __ARGS((expand_T *xp, int type, int options, int escape)); static int nextwild(expand_T *xp, int type, int options, int escape);
static void escape_fname __ARGS((char_u **pp)); static void escape_fname(char_u **pp);
static int showmatches __ARGS((expand_T *xp, int wildmenu)); static int showmatches(expand_T *xp, int wildmenu);
static void set_expand_context __ARGS((expand_T *xp)); static void set_expand_context(expand_T *xp);
static int ExpandFromContext __ARGS((expand_T *xp, char_u *, int *, char_u ***, int)); static int ExpandFromContext(expand_T *xp, char_u *, int *, char_u ***, int);
static int expand_showtail __ARGS((expand_T *xp)); static int expand_showtail(expand_T *xp);
#ifdef FEAT_CMDL_COMPL #ifdef FEAT_CMDL_COMPL
static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg)); static int expand_shellcmd(char_u *filepat, int *num_file, char_u ***file, int flagsarg);
static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[])); static int ExpandRTDir(char_u *pat, int *num_file, char_u ***file, char *dirname[]);
# ifdef FEAT_CMDHIST # ifdef FEAT_CMDHIST
static char_u *get_history_arg __ARGS((expand_T *xp, int idx)); static char_u *get_history_arg(expand_T *xp, int idx);
# endif # endif
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); static int ExpandUserDefined(expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file);
static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file)); static int ExpandUserList(expand_T *xp, int *num_file, char_u ***file);
# endif # endif
#endif #endif
#ifdef FEAT_CMDHIST #ifdef FEAT_CMDHIST
static void clear_hist_entry __ARGS((histentry_T *hisptr)); static void clear_hist_entry(histentry_T *hisptr);
#endif #endif
#ifdef FEAT_CMDWIN #ifdef FEAT_CMDWIN
static int ex_window __ARGS((void)); static int ex_window(void);
#endif #endif
#if defined(FEAT_CMDL_COMPL) || defined(PROTO) #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
@ -133,7 +133,7 @@ static int
#ifdef __BORLANDC__ #ifdef __BORLANDC__
_RTLENTRYF _RTLENTRYF
#endif #endif
sort_func_compare __ARGS((const void *s1, const void *s2)); sort_func_compare(const void *s1, const void *s2);
#endif #endif
/* /*
@ -4530,7 +4530,7 @@ expand_cmdline(xp, str, col, matchcount, matches)
/* /*
* Cleanup matches for help tags: remove "@en" if "en" is the only language. * Cleanup matches for help tags: remove "@en" if "en" is the only language.
*/ */
static void cleanup_help_tags __ARGS((int num_file, char_u **file)); static void cleanup_help_tags(int num_file, char_u **file);
static void static void
cleanup_help_tags(num_file, file) cleanup_help_tags(num_file, file)
@ -5009,7 +5009,7 @@ expand_shellcmd(filepat, num_file, file, flagsarg)
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
static void * call_user_expand_func __ARGS((void *(*user_expand_func) __ARGS((char_u *, int, char_u **, int)), expand_T *xp, int *num_file, char_u ***file)); static void * call_user_expand_func(void *(*user_expand_func)(char_u *, int, char_u **, int), expand_T *xp, int *num_file, char_u ***file);
/* /*
* Call "user_expand_func()" to invoke a user defined VimL function and return * Call "user_expand_func()" to invoke a user defined VimL function and return
@ -5017,7 +5017,7 @@ static void * call_user_expand_func __ARGS((void *(*user_expand_func) __ARGS((ch
*/ */
static void * static void *
call_user_expand_func(user_expand_func, xp, num_file, file) call_user_expand_func(user_expand_func, xp, num_file, file)
void *(*user_expand_func) __ARGS((char_u *, int, char_u **, int)); void *(*user_expand_func)(char_u *, int, char_u **, int);
expand_T *xp; expand_T *xp;
int *num_file; int *num_file;
char_u ***file; char_u ***file;
@ -5610,7 +5610,7 @@ get_history_idx(histype)
return history[histype][hisidx[histype]].hisnum; return history[histype][hisidx[histype]].hisnum;
} }
static struct cmdline_info *get_ccline_ptr __ARGS((void)); static struct cmdline_info *get_ccline_ptr(void);
/* /*
* Get pointer to the command line info to use. cmdline_paste() may clear * Get pointer to the command line info to use. cmdline_paste() may clear
@ -6066,7 +6066,7 @@ static int viminfo_hisidx[HIST_COUNT] = {0, 0, 0, 0};
static int viminfo_hislen[HIST_COUNT] = {0, 0, 0, 0}; static int viminfo_hislen[HIST_COUNT] = {0, 0, 0, 0};
static int viminfo_add_at_front = FALSE; static int viminfo_add_at_front = FALSE;
static int hist_type2char __ARGS((int type, int use_question)); static int hist_type2char(int type, int use_question);
/* /*
* Translate a history type number to the associated character. * Translate a history type number to the associated character.

40
src/farsi.c
View File

@ -13,26 +13,26 @@
* Included by main.c, when FEAT_FKMAP is defined. * Included by main.c, when FEAT_FKMAP is defined.
*/ */
static int toF_Xor_X_ __ARGS((int c)); static int toF_Xor_X_(int c);
static int F_is_TyE __ARGS((int c)); static int F_is_TyE(int c);
static int F_is_TyC_TyD __ARGS((int c)); static int F_is_TyC_TyD(int c);
static int F_is_TyB_TyC_TyD __ARGS((int src, int offset)); static int F_is_TyB_TyC_TyD(int src, int offset);
static int toF_TyB __ARGS((int c)); static int toF_TyB(int c);
static void put_curr_and_l_to_X __ARGS((int c)); static void put_curr_and_l_to_X(int c);
static void put_and_redo __ARGS((int c)); static void put_and_redo(int c);
static void chg_c_toX_orX __ARGS((void)); static void chg_c_toX_orX(void);
static void chg_c_to_X_orX_ __ARGS((void)); static void chg_c_to_X_orX_(void);
static void chg_c_to_X_or_X __ARGS((void)); static void chg_c_to_X_or_X(void);
static void chg_l_to_X_orX_ __ARGS((void)); static void chg_l_to_X_orX_(void);
static void chg_l_toXor_X __ARGS((void)); static void chg_l_toXor_X(void);
static void chg_r_to_Xor_X_ __ARGS((void)); static void chg_r_to_Xor_X_(void);
static int toF_leading __ARGS((int c)); static int toF_leading(int c);
static int toF_Rjoin __ARGS((int c)); static int toF_Rjoin(int c);
static int canF_Ljoin __ARGS((int c)); static int canF_Ljoin(int c);
static int canF_Rjoin __ARGS((int c)); static int canF_Rjoin(int c);
static int F_isterm __ARGS((int c)); static int F_isterm(int c);
static int toF_ending __ARGS((int c)); static int toF_ending(int c);
static void lrswapbuf __ARGS((char_u *buf, int len)); static void lrswapbuf(char_u *buf, int len);
/* /*
** Convert the given Farsi character into a _X or _X_ type ** Convert the given Farsi character into a _X or _X_ type

76
src/fileio.c
View File

@ -32,28 +32,28 @@
static int is_dev_fd_file(char_u *fname); static int is_dev_fd_file(char_u *fname);
#endif #endif
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
static char_u *next_fenc __ARGS((char_u **pp)); static char_u *next_fenc(char_u **pp);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
static char_u *readfile_charconvert __ARGS((char_u *fname, char_u *fenc, int *fdp)); static char_u *readfile_charconvert(char_u *fname, char_u *fenc, int *fdp);
# endif # endif
#endif #endif
#ifdef FEAT_VIMINFO #ifdef FEAT_VIMINFO
static void check_marks_read __ARGS((void)); static void check_marks_read(void);
#endif #endif
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
static char_u *check_for_cryptkey __ARGS((char_u *cryptkey, char_u *ptr, long *sizep, off_t *filesizep, int newfile, char_u *fname, int *did_ask)); static char_u *check_for_cryptkey(char_u *cryptkey, char_u *ptr, long *sizep, off_t *filesizep, int newfile, char_u *fname, int *did_ask);
#endif #endif
#ifdef UNIX #ifdef UNIX
static void set_file_time __ARGS((char_u *fname, time_t atime, time_t mtime)); static void set_file_time(char_u *fname, time_t atime, time_t mtime);
#endif #endif
static int set_rw_fname __ARGS((char_u *fname, char_u *sfname)); static int set_rw_fname(char_u *fname, char_u *sfname);
static int msg_add_fileformat __ARGS((int eol_type)); static int msg_add_fileformat(int eol_type);
static void msg_add_eol __ARGS((void)); static void msg_add_eol(void);
static int check_mtime __ARGS((buf_T *buf, struct stat *s)); static int check_mtime(buf_T *buf, struct stat *s);
static int time_differs __ARGS((long t1, long t2)); static int time_differs(long t1, long t2);
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
static int apply_autocmds_exarg __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap)); static int apply_autocmds_exarg(event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap);
static int au_find_group __ARGS((char_u *name)); static int au_find_group(char_u *name);
# define AUGROUP_DEFAULT -1 /* default autocmd group */ # define AUGROUP_DEFAULT -1 /* default autocmd group */
# define AUGROUP_ERROR -2 /* erroneous autocmd group */ # define AUGROUP_ERROR -2 /* erroneous autocmd group */
@ -119,25 +119,25 @@ struct bw_info
#endif #endif
}; };
static int buf_write_bytes __ARGS((struct bw_info *ip)); static int buf_write_bytes(struct bw_info *ip);
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp)); static linenr_T readfile_linenr(linenr_T linecnt, char_u *p, char_u *endp);
static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags)); static int ucs2bytes(unsigned c, char_u **pp, int flags);
static int need_conversion __ARGS((char_u *fenc)); static int need_conversion(char_u *fenc);
static int get_fio_flags __ARGS((char_u *ptr)); static int get_fio_flags(char_u *ptr);
static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags)); static char_u *check_for_bom(char_u *p, long size, int *lenp, int flags);
static int make_bom __ARGS((char_u *buf, char_u *name)); static int make_bom(char_u *buf, char_u *name);
# ifdef WIN3264 # ifdef WIN3264
static int get_win_fio_flags __ARGS((char_u *ptr)); static int get_win_fio_flags(char_u *ptr);
# endif # endif
# ifdef MACOS_X # ifdef MACOS_X
static int get_mac_fio_flags __ARGS((char_u *ptr)); static int get_mac_fio_flags(char_u *ptr);
# endif # endif
#endif #endif
static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf)); static int move_lines(buf_T *frombuf, buf_T *tobuf);
#ifdef TEMPDIRNAMES #ifdef TEMPDIRNAMES
static void vim_settempdir __ARGS((char_u *tempdir)); static void vim_settempdir(char_u *tempdir);
#endif #endif
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name"); static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
@ -7811,22 +7811,22 @@ static int current_augroup = AUGROUP_DEFAULT;
static int au_need_clean = FALSE; /* need to delete marked patterns */ static int au_need_clean = FALSE; /* need to delete marked patterns */
static void show_autocmd __ARGS((AutoPat *ap, event_T event)); static void show_autocmd(AutoPat *ap, event_T event);
static void au_remove_pat __ARGS((AutoPat *ap)); static void au_remove_pat(AutoPat *ap);
static void au_remove_cmds __ARGS((AutoPat *ap)); static void au_remove_cmds(AutoPat *ap);
static void au_cleanup __ARGS((void)); static void au_cleanup(void);
static int au_new_group __ARGS((char_u *name)); static int au_new_group(char_u *name);
static void au_del_group __ARGS((char_u *name)); static void au_del_group(char_u *name);
static event_T event_name2nr __ARGS((char_u *start, char_u **end)); static event_T event_name2nr(char_u *start, char_u **end);
static char_u *event_nr2name __ARGS((event_T event)); static char_u *event_nr2name(event_T event);
static char_u *find_end_event __ARGS((char_u *arg, int have_group)); static char_u *find_end_event(char_u *arg, int have_group);
static int event_ignored __ARGS((event_T event)); static int event_ignored(event_T event);
static int au_get_grouparg __ARGS((char_u **argp)); static int au_get_grouparg(char_u **argp);
static int do_autocmd_event __ARGS((event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group)); static int do_autocmd_event(event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group);
static int apply_autocmds_group __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap)); static int apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap);
static void auto_next_pat __ARGS((AutoPatCmd *apc, int stop_at_last)); static void auto_next_pat(AutoPatCmd *apc, int stop_at_last);
#if defined(FEAT_AUTOCMD) || defined(FEAT_WILDIGN) #if defined(FEAT_AUTOCMD) || defined(FEAT_WILDIGN)
static int match_file_pat __ARGS((char_u *pattern, regprog_T **prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs)); static int match_file_pat(char_u *pattern, regprog_T **prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs);
#endif #endif

68
src/fold.c
View File

@ -43,27 +43,27 @@ typedef struct
#define MAX_LEVEL 20 /* maximum fold depth */ #define MAX_LEVEL 20 /* maximum fold depth */
/* static functions {{{2 */ /* static functions {{{2 */
static void newFoldLevelWin __ARGS((win_T *wp)); static void newFoldLevelWin(win_T *wp);
static int checkCloseRec __ARGS((garray_T *gap, linenr_T lnum, int level)); static int checkCloseRec(garray_T *gap, linenr_T lnum, int level);
static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp)); static int foldFind(garray_T *gap, linenr_T lnum, fold_T **fpp);
static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum)); static int foldLevelWin(win_T *wp, linenr_T lnum);
static void checkupdate __ARGS((win_T *wp)); static void checkupdate(win_T *wp);
static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open)); static void setFoldRepeat(linenr_T lnum, long count, int do_open);
static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep)); static linenr_T setManualFold(linenr_T lnum, int opening, int recurse, int *donep);
static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep)); static linenr_T setManualFoldWin(win_T *wp, linenr_T lnum, int opening, int recurse, int *donep);
static void foldOpenNested __ARGS((fold_T *fpr)); static void foldOpenNested(fold_T *fpr);
static void deleteFoldEntry __ARGS((garray_T *gap, int idx, int recursive)); static void deleteFoldEntry(garray_T *gap, int idx, int recursive);
static void foldMarkAdjustRecurse __ARGS((garray_T *gap, linenr_T line1, linenr_T line2, long amount, long amount_after)); static void foldMarkAdjustRecurse(garray_T *gap, linenr_T line1, linenr_T line2, long amount, long amount_after);
static int getDeepestNestingRecurse __ARGS((garray_T *gap)); static int getDeepestNestingRecurse(garray_T *gap);
static int check_closed __ARGS((win_T *win, fold_T *fp, int *use_levelp, int level, int *maybe_smallp, linenr_T lnum_off)); static int check_closed(win_T *win, fold_T *fp, int *use_levelp, int level, int *maybe_smallp, linenr_T lnum_off);
static void checkSmall __ARGS((win_T *wp, fold_T *fp, linenr_T lnum_off)); static void checkSmall(win_T *wp, fold_T *fp, linenr_T lnum_off);
static void setSmallMaybe __ARGS((garray_T *gap)); static void setSmallMaybe(garray_T *gap);
static void foldCreateMarkers __ARGS((linenr_T start, linenr_T end)); static void foldCreateMarkers(linenr_T start, linenr_T end);
static void foldAddMarker __ARGS((linenr_T lnum, char_u *marker, int markerlen)); static void foldAddMarker(linenr_T lnum, char_u *marker, int markerlen);
static void deleteFoldMarkers __ARGS((fold_T *fp, int recursive, linenr_T lnum_off)); static void deleteFoldMarkers(fold_T *fp, int recursive, linenr_T lnum_off);
static void foldDelMarker __ARGS((linenr_T lnum, char_u *marker, int markerlen)); static void foldDelMarker(linenr_T lnum, char_u *marker, int markerlen);
static void foldUpdateIEMS __ARGS((win_T *wp, linenr_T top, linenr_T bot)); static void foldUpdateIEMS(win_T *wp, linenr_T top, linenr_T bot);
static void parseMarker __ARGS((win_T *wp)); static void parseMarker(win_T *wp);
static char *e_nofold = N_("E490: No fold found"); static char *e_nofold = N_("E490: No fold found");
@ -2142,18 +2142,18 @@ typedef struct
static int fold_changed; static int fold_changed;
/* Function declarations. {{{2 */ /* Function declarations. {{{2 */
static linenr_T foldUpdateIEMSRecurse __ARGS((garray_T *gap, int level, linenr_T startlnum, fline_T *flp, void (*getlevel)__ARGS((fline_T *)), linenr_T bot, int topflags)); static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level, linenr_T startlnum, fline_T *flp, void (*getlevel)__ARGS((fline_T *)), linenr_T bot, int topflags);
static int foldInsert __ARGS((garray_T *gap, int i)); static int foldInsert(garray_T *gap, int i);
static void foldSplit __ARGS((garray_T *gap, int i, linenr_T top, linenr_T bot)); static void foldSplit(garray_T *gap, int i, linenr_T top, linenr_T bot);
static void foldRemove __ARGS((garray_T *gap, linenr_T top, linenr_T bot)); static void foldRemove(garray_T *gap, linenr_T top, linenr_T bot);
static void foldMerge __ARGS((fold_T *fp1, garray_T *gap, fold_T *fp2)); static void foldMerge(fold_T *fp1, garray_T *gap, fold_T *fp2);
static void foldlevelIndent __ARGS((fline_T *flp)); static void foldlevelIndent(fline_T *flp);
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
static void foldlevelDiff __ARGS((fline_T *flp)); static void foldlevelDiff(fline_T *flp);
#endif #endif
static void foldlevelExpr __ARGS((fline_T *flp)); static void foldlevelExpr(fline_T *flp);
static void foldlevelMarker __ARGS((fline_T *flp)); static void foldlevelMarker(fline_T *flp);
static void foldlevelSyntax __ARGS((fline_T *flp)); static void foldlevelSyntax(fline_T *flp);
/* foldUpdateIEMS() {{{2 */ /* foldUpdateIEMS() {{{2 */
/* /*
@ -3314,9 +3314,9 @@ foldlevelSyntax(flp)
/* functions for storing the fold state in a View {{{1 */ /* functions for storing the fold state in a View {{{1 */
/* put_folds() {{{2 */ /* put_folds() {{{2 */
#if defined(FEAT_SESSION) || defined(PROTO) #if defined(FEAT_SESSION) || defined(PROTO)
static int put_folds_recurse __ARGS((FILE *fd, garray_T *gap, linenr_T off)); static int put_folds_recurse(FILE *fd, garray_T *gap, linenr_T off);
static int put_foldopen_recurse __ARGS((FILE *fd, win_T *wp, garray_T *gap, linenr_T off)); static int put_foldopen_recurse(FILE *fd, win_T *wp, garray_T *gap, linenr_T off);
static int put_fold_open_close __ARGS((FILE *fd, fold_T *fp, linenr_T off)); static int put_fold_open_close(FILE *fd, fold_T *fp, linenr_T off);
/* /*
* Write commands to "fd" to restore the manual folds in window "wp". * Write commands to "fd" to restore the manual folds in window "wp".

36
src/getchar.c
View File

@ -112,25 +112,25 @@ static char_u noremapbuf_init[TYPELEN_INIT]; /* initial typebuf.tb_noremap */
static int last_recorded_len = 0; /* number of last recorded chars */ static int last_recorded_len = 0; /* number of last recorded chars */
static char_u *get_buffcont __ARGS((buffheader_T *, int)); static char_u *get_buffcont(buffheader_T *, int);
static void add_buff __ARGS((buffheader_T *, char_u *, long n)); static void add_buff(buffheader_T *, char_u *, long n);
static void add_num_buff __ARGS((buffheader_T *, long)); static void add_num_buff(buffheader_T *, long);
static void add_char_buff __ARGS((buffheader_T *, int)); static void add_char_buff(buffheader_T *, int);
static int read_readbuffers __ARGS((int advance)); static int read_readbuffers(int advance);
static int read_readbuf __ARGS((buffheader_T *buf, int advance)); static int read_readbuf(buffheader_T *buf, int advance);
static void start_stuff __ARGS((void)); static void start_stuff(void);
static int read_redo __ARGS((int, int)); static int read_redo(int, int);
static void copy_redo __ARGS((int)); static void copy_redo(int);
static void init_typebuf __ARGS((void)); static void init_typebuf(void);
static void gotchars __ARGS((char_u *, int)); static void gotchars(char_u *, int);
static void may_sync_undo __ARGS((void)); static void may_sync_undo(void);
static void closescript __ARGS((void)); static void closescript(void);
static int vgetorpeek __ARGS((int)); static int vgetorpeek(int);
static void map_free __ARGS((mapblock_T **)); static void map_free(mapblock_T **);
static void validate_maphash __ARGS((void)); static void validate_maphash(void);
static void showmap __ARGS((mapblock_T *mp, int local)); static void showmap(mapblock_T *mp, int local);
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
static char_u *eval_map_expr __ARGS((char_u *str, int c)); static char_u *eval_map_expr(char_u *str, int c);
#endif #endif
/* /*

46
src/gui.c
View File

@ -14,34 +14,34 @@
gui_T gui; gui_T gui;
#if defined(FEAT_MBYTE) && !defined(FEAT_GUI_GTK) #if defined(FEAT_MBYTE) && !defined(FEAT_GUI_GTK)
static void set_guifontwide __ARGS((char_u *font_name)); static void set_guifontwide(char_u *font_name);
#endif #endif
static void gui_check_pos __ARGS((void)); static void gui_check_pos(void);
static void gui_position_components __ARGS((int)); static void gui_position_components(int);
static void gui_outstr __ARGS((char_u *, int)); static void gui_outstr(char_u *, int);
static int gui_screenchar __ARGS((int off, int flags, guicolor_T fg, guicolor_T bg, int back)); static int gui_screenchar(int off, int flags, guicolor_T fg, guicolor_T bg, int back);
#ifdef FEAT_GUI_GTK #ifdef FEAT_GUI_GTK
static int gui_screenstr __ARGS((int off, int len, int flags, guicolor_T fg, guicolor_T bg, int back)); static int gui_screenstr(int off, int len, int flags, guicolor_T fg, guicolor_T bg, int back);
#endif #endif
static void gui_delete_lines __ARGS((int row, int count)); static void gui_delete_lines(int row, int count);
static void gui_insert_lines __ARGS((int row, int count)); static void gui_insert_lines(int row, int count);
static void fill_mouse_coord __ARGS((char_u *p, int col, int row)); static void fill_mouse_coord(char_u *p, int col, int row);
#if defined(FEAT_GUI_TABLINE) || defined(PROTO) #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
static int gui_has_tabline __ARGS((void)); static int gui_has_tabline(void);
#endif #endif
static void gui_do_scrollbar __ARGS((win_T *wp, int which, int enable)); static void gui_do_scrollbar(win_T *wp, int which, int enable);
static colnr_T scroll_line_len __ARGS((linenr_T lnum)); static colnr_T scroll_line_len(linenr_T lnum);
static linenr_T gui_find_longest_lnum __ARGS((void)); static linenr_T gui_find_longest_lnum(void);
static void gui_update_horiz_scrollbar __ARGS((int)); static void gui_update_horiz_scrollbar(int);
static void gui_set_fg_color __ARGS((char_u *name)); static void gui_set_fg_color(char_u *name);
static void gui_set_bg_color __ARGS((char_u *name)); static void gui_set_bg_color(char_u *name);
static win_T *xy2win __ARGS((int x, int y)); static win_T *xy2win(int x, int y);
#if defined(UNIX) && !defined(MACOS_X) && !defined(__APPLE__) #if defined(UNIX) && !defined(MACOS_X) && !defined(__APPLE__)
# define MAY_FORK # define MAY_FORK
static void gui_do_fork __ARGS((void)); static void gui_do_fork(void);
static int gui_read_child_pipe __ARGS((int fd)); static int gui_read_child_pipe(int fd);
/* Return values for gui_read_child_pipe */ /* Return values for gui_read_child_pipe */
enum { enum {
@ -52,7 +52,7 @@ enum {
#endif /* MAY_FORK */ #endif /* MAY_FORK */
static void gui_attempt_start __ARGS((void)); static void gui_attempt_start(void);
static int can_update_cursor = TRUE; /* can display the cursor */ static int can_update_cursor = TRUE; /* can display the cursor */
@ -5017,7 +5017,7 @@ ex_gui(eap)
/* /*
* This is shared between Athena, Motif and GTK. * This is shared between Athena, Motif and GTK.
*/ */
static void gfp_setname __ARGS((char_u *fname, void *cookie)); static void gfp_setname(char_u *fname, void *cookie);
/* /*
* Callback function for do_in_runtimepath(). * Callback function for do_in_runtimepath().
@ -5191,7 +5191,7 @@ gui_update_screen()
#endif #endif
#if defined(FIND_REPLACE_DIALOG) || defined(PROTO) #if defined(FIND_REPLACE_DIALOG) || defined(PROTO)
static void concat_esc __ARGS((garray_T *gap, char_u *text, int what)); static void concat_esc(garray_T *gap, char_u *text, int what);
/* /*
* Get the text to use in a find/replace dialog. Uses the last search pattern * Get the text to use in a find/replace dialog. Uses the last search pattern
@ -5416,7 +5416,7 @@ gui_do_findrepl(flags, find_text, repl_text, down)
|| defined(PROTO) || defined(PROTO)
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
static void gui_wingoto_xy __ARGS((int x, int y)); static void gui_wingoto_xy(int x, int y);
/* /*
* Jump to the window at specified point (x, y). * Jump to the window at specified point (x, y).

110
src/gui_at_fs.c
View File

@ -172,36 +172,36 @@ static int SFstatus = SEL_FILE_NULL;
/***************** static functions */ /***************** static functions */
static void SFsetText __ARGS((char *path)); static void SFsetText(char *path);
static void SFtextChanged __ARGS((void)); static void SFtextChanged(void);
static char *SFgetText __ARGS((void)); static char *SFgetText(void);
static void SFupdatePath __ARGS((void)); static void SFupdatePath(void);
static int SFgetDir __ARGS((SFDir *dir)); static int SFgetDir(SFDir *dir);
static void SFdrawLists __ARGS((int doScroll)); static void SFdrawLists(int doScroll);
static void SFdrawList __ARGS((int n, int doScroll)); static void SFdrawList(int n, int doScroll);
static void SFclearList __ARGS((int n, int doScroll)); static void SFclearList(int n, int doScroll);
static void SFbuttonPressList __ARGS((Widget w, int n, XButtonPressedEvent *event)); static void SFbuttonPressList(Widget w, int n, XButtonPressedEvent *event);
static void SFbuttonReleaseList __ARGS((Widget w, int n, XButtonReleasedEvent *event)); static void SFbuttonReleaseList(Widget w, int n, XButtonReleasedEvent *event);
static void SFdirModTimer __ARGS((XtPointer cl, XtIntervalId *id)); static void SFdirModTimer(XtPointer cl, XtIntervalId *id);
static char SFstatChar __ARGS((struct stat *statBuf)); static char SFstatChar(struct stat *statBuf);
static void SFdrawStrings __ARGS((Window w, SFDir *dir, int from, int to)); static void SFdrawStrings(Window w, SFDir *dir, int from, int to);
static int SFnewInvertEntry __ARGS((int n, XMotionEvent *event)); static int SFnewInvertEntry(int n, XMotionEvent *event);
static void SFinvertEntry __ARGS((int n)); static void SFinvertEntry(int n);
static void SFenterList __ARGS((Widget w, int n, XEnterWindowEvent *event)); static void SFenterList(Widget w, int n, XEnterWindowEvent *event);
static void SFleaveList __ARGS((Widget w, int n, XEvent *event)); static void SFleaveList(Widget w, int n, XEvent *event);
static void SFmotionList __ARGS((Widget w, int n, XMotionEvent *event)); static void SFmotionList(Widget w, int n, XMotionEvent *event);
static void SFvFloatSliderMovedCallback __ARGS((Widget w, XtPointer n, XtPointer fnew)); static void SFvFloatSliderMovedCallback(Widget w, XtPointer n, XtPointer fnew);
static void SFvSliderMovedCallback __ARGS((Widget w, int n, int nw)); static void SFvSliderMovedCallback(Widget w, int n, int nw);
static void SFvAreaSelectedCallback __ARGS((Widget w, XtPointer n, XtPointer pnew)); static void SFvAreaSelectedCallback(Widget w, XtPointer n, XtPointer pnew);
static void SFhSliderMovedCallback __ARGS((Widget w, XtPointer n, XtPointer nw)); static void SFhSliderMovedCallback(Widget w, XtPointer n, XtPointer nw);
static void SFhAreaSelectedCallback __ARGS((Widget w, XtPointer n, XtPointer pnew)); static void SFhAreaSelectedCallback(Widget w, XtPointer n, XtPointer pnew);
static void SFpathSliderMovedCallback __ARGS((Widget w, XtPointer client_data, XtPointer nw)); static void SFpathSliderMovedCallback(Widget w, XtPointer client_data, XtPointer nw);
static void SFpathAreaSelectedCallback __ARGS((Widget w, XtPointer client_data, XtPointer pnew)); static void SFpathAreaSelectedCallback(Widget w, XtPointer client_data, XtPointer pnew);
static Boolean SFworkProc __ARGS((void)); static Boolean SFworkProc(void);
static int SFcompareEntries __ARGS((const void *p, const void *q)); static int SFcompareEntries(const void *p, const void *q);
static void SFprepareToReturn __ARGS((void)); static void SFprepareToReturn(void);
static void SFcreateWidgets __ARGS((Widget toplevel, char *prompt, char *ok, char *cancel)); static void SFcreateWidgets(Widget toplevel, char *prompt, char *ok, char *cancel);
static void SFsetColors __ARGS((guicolor_T bg, guicolor_T fg, guicolor_T scroll_bg, guicolor_T scrollfg)); static void SFsetColors(guicolor_T bg, guicolor_T fg, guicolor_T scroll_bg, guicolor_T scrollfg);
/***************** xstat.h */ /***************** xstat.h */
@ -237,7 +237,7 @@ static SFLogin *SFlogins;
static int SFtwiddle = 0; static int SFtwiddle = 0;
static int SFchdir __ARGS((char *path)); static int SFchdir(char *path);
static int static int
SFchdir(path) SFchdir(path)
@ -257,7 +257,7 @@ SFchdir(path)
return result; return result;
} }
static void SFfree __ARGS((int i)); static void SFfree(int i);
static void static void
SFfree(i) SFfree(i)
@ -281,7 +281,7 @@ SFfree(i)
dir->dir = NULL; dir->dir = NULL;
} }
static void SFstrdup __ARGS((char **s1, char *s2)); static void SFstrdup(char **s1, char *s2);
static void static void
SFstrdup(s1, s2) SFstrdup(s1, s2)
@ -291,7 +291,7 @@ SFstrdup(s1, s2)
*s1 = strcpy(XtMalloc((unsigned)(strlen(s2) + 1)), s2); *s1 = strcpy(XtMalloc((unsigned)(strlen(s2) + 1)), s2);
} }
static void SFunreadableDir __ARGS((SFDir *dir)); static void SFunreadableDir(SFDir *dir);
static void static void
SFunreadableDir(dir) SFunreadableDir(dir)
@ -307,7 +307,7 @@ SFunreadableDir(dir)
dir->nChars = strlen(cannotOpen); dir->nChars = strlen(cannotOpen);
} }
static void SFreplaceText __ARGS((SFDir *dir, char *str)); static void SFreplaceText(SFDir *dir, char *str);
static void static void
SFreplaceText(dir, str) SFreplaceText(dir, str)
@ -330,7 +330,7 @@ SFreplaceText(dir, str)
SFtextChanged(); SFtextChanged();
} }
static void SFexpand __ARGS((char *str)); static void SFexpand(char *str);
static void static void
SFexpand(str) SFexpand(str)
@ -387,7 +387,7 @@ SFexpand(str)
XtFree(growing); XtFree(growing);
} }
static int SFfindFile __ARGS((SFDir *dir, char *str)); static int SFfindFile(SFDir *dir, char *str);
static int static int
SFfindFile(dir, str) SFfindFile(dir, str)
@ -488,7 +488,7 @@ SFfindFile(dir, str)
return 0; return 0;
} }
static void SFunselect __ARGS((void)); static void SFunselect(void);
static void static void
SFunselect() SFunselect()
@ -502,7 +502,7 @@ SFunselect()
dir->endSelection = -1; dir->endSelection = -1;
} }
static int SFcompareLogins __ARGS((const void *p, const void *q)); static int SFcompareLogins(const void *p, const void *q);
static int static int
SFcompareLogins(p, q) SFcompareLogins(p, q)
@ -511,7 +511,7 @@ SFcompareLogins(p, q)
return strcmp(((SFLogin *)p)->name, ((SFLogin *)q)->name); return strcmp(((SFLogin *)p)->name, ((SFLogin *)q)->name);
} }
static void SFgetHomeDirs __ARGS((void)); static void SFgetHomeDirs(void);
static void static void
SFgetHomeDirs() SFgetHomeDirs()
@ -579,7 +579,7 @@ SFgetHomeDirs()
(void)strcat(entries[i].real, "/"); (void)strcat(entries[i].real, "/");
} }
static int SFfindHomeDir __ARGS((char *begin, char *end)); static int SFfindHomeDir(char *begin, char *end);
static int static int
SFfindHomeDir(begin, end) SFfindHomeDir(begin, end)
@ -882,7 +882,7 @@ SFbuttonReleaseList(w, n, event)
} }
} }
static int SFcheckDir __ARGS((int n, SFDir *dir)); static int SFcheckDir(int n, SFDir *dir);
static int static int
SFcheckDir(n, dir) SFcheckDir(n, dir)
@ -948,7 +948,7 @@ SFcheckDir(n, dir)
return 0; return 0;
} }
static int SFcheckFiles __ARGS((SFDir *dir)); static int SFcheckFiles(SFDir *dir);
static int static int
SFcheckFiles(dir) SFcheckFiles(dir)
@ -1097,7 +1097,7 @@ static int SFcurrentListY;
static XtIntervalId SFscrollTimerId; static XtIntervalId SFscrollTimerId;
static void SFinitFont __ARGS((void)); static void SFinitFont(void);
static void static void
SFinitFont() SFinitFont()
@ -1148,7 +1148,7 @@ SFinitFont()
#endif #endif
} }
static void SFcreateGC __ARGS((void)); static void SFcreateGC(void);
static void static void
SFcreateGC() SFcreateGC()
@ -1283,7 +1283,7 @@ SFclearList(n, doScroll)
} }
} }
static void SFdeleteEntry __ARGS((SFDir *dir, SFEntry *entry)); static void SFdeleteEntry(SFDir *dir, SFEntry *entry);
static void static void
SFdeleteEntry(dir, entry) SFdeleteEntry(dir, entry)
@ -1337,7 +1337,7 @@ SFdeleteEntry(dir, entry)
#endif #endif
} }
static void SFwriteStatChar __ARGS((char *name, int last, struct stat *statBuf)); static void SFwriteStatChar(char *name, int last, struct stat *statBuf);
static void static void
SFwriteStatChar(name, last, statBuf) SFwriteStatChar(name, last, statBuf)
@ -1348,7 +1348,7 @@ SFwriteStatChar(name, last, statBuf)
name[last] = SFstatChar(statBuf); name[last] = SFstatChar(statBuf);
} }
static int SFstatAndCheck __ARGS((SFDir *dir, SFEntry *entry)); static int SFstatAndCheck(SFDir *dir, SFEntry *entry);
static int static int
SFstatAndCheck(dir, entry) SFstatAndCheck(dir, entry)
@ -1562,7 +1562,7 @@ SFinvertEntry(n)
SFentryHeight); SFentryHeight);
} }
static unsigned long SFscrollTimerInterval __ARGS((void)); static unsigned long SFscrollTimerInterval(void);
static unsigned long static unsigned long
SFscrollTimerInterval() SFscrollTimerInterval()
@ -1591,7 +1591,7 @@ SFscrollTimerInterval()
return (unsigned long)t; return (unsigned long)t;
} }
static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id)); static void SFscrollTimer(XtPointer p, XtIntervalId *id);
static void static void
SFscrollTimer(p, id) SFscrollTimer(p, id)
@ -2191,7 +2191,7 @@ static char *oneLineTextEditTranslations = "\
Ctrl<Key>M: redraw-display()\n\ Ctrl<Key>M: redraw-display()\n\
"; ";
static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont)); static void SFexposeList(Widget w, XtPointer n, XEvent *event, Boolean *cont);
static void static void
SFexposeList(w, n, event, cont) SFexposeList(w, n, event, cont)
@ -2206,7 +2206,7 @@ SFexposeList(w, n, event, cont)
SFdrawList((int)(long)n, SF_DO_NOT_SCROLL); SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
} }
static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont)); static void SFmodVerifyCallback(Widget w, XtPointer client_data, XEvent *event, Boolean *cont);
static void static void
SFmodVerifyCallback(w, client_data, event, cont) SFmodVerifyCallback(w, client_data, event, cont)
@ -2224,7 +2224,7 @@ SFmodVerifyCallback(w, client_data, event, cont)
SFstatus = SEL_FILE_TEXT; SFstatus = SEL_FILE_TEXT;
} }
static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd)); static void SFokCallback(Widget w, XtPointer cl, XtPointer cd);
static void static void
SFokCallback(w, cl, cd) SFokCallback(w, cl, cd)
@ -2241,7 +2241,7 @@ static XtCallbackRec SFokSelect[] =
{ NULL, (XtPointer) NULL }, { NULL, (XtPointer) NULL },
}; };
static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd)); static void SFcancelCallback(Widget w, XtPointer cl, XtPointer cd);
static void static void
SFcancelCallback(w, cl, cd) SFcancelCallback(w, cl, cd)
@ -2258,7 +2258,7 @@ static XtCallbackRec SFcancelSelect[] =
{ NULL, (XtPointer) NULL }, { NULL, (XtPointer) NULL },
}; };
static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params)); static void SFdismissAction(Widget w, XEvent *event, String *params, Cardinal *num_params);
static void static void
SFdismissAction(w, event, params, num_params) SFdismissAction(w, event, params, num_params)

50
src/gui_athena.c
View File

@ -49,15 +49,15 @@ static XtIntervalId timer = 0; /* 0 = expired, otherwise active */
/* Used to figure out menu ordering */ /* Used to figure out menu ordering */
static vimmenu_T *a_cur_menu = NULL; static vimmenu_T *a_cur_menu = NULL;
static Cardinal athena_calculate_ins_pos __ARGS((Widget)); static Cardinal athena_calculate_ins_pos(Widget);
static Pixmap gui_athena_create_pullright_pixmap __ARGS((Widget)); static Pixmap gui_athena_create_pullright_pixmap(Widget);
static void gui_athena_menu_timeout __ARGS((XtPointer, XtIntervalId *)); static void gui_athena_menu_timeout(XtPointer, XtIntervalId *);
static void gui_athena_popup_callback __ARGS((Widget, XtPointer, XtPointer)); static void gui_athena_popup_callback(Widget, XtPointer, XtPointer);
static void gui_athena_delayed_arm_action __ARGS((Widget, XEvent *, String *, static void gui_athena_delayed_arm_action(Widget, XEvent *, String *,
Cardinal *)); Cardinal *);
static void gui_athena_popdown_submenus_action __ARGS((Widget, XEvent *, static void gui_athena_popdown_submenus_action(Widget, XEvent *,
String *, Cardinal *)); String *, Cardinal *);
static XtActionsRec pullAction[2] = { static XtActionsRec pullAction[2] = {
{ "menu-delayedpopup", (XtActionProc)gui_athena_delayed_arm_action}, { "menu-delayedpopup", (XtActionProc)gui_athena_delayed_arm_action},
{ "menu-popdownsubmenus", (XtActionProc)gui_athena_popdown_submenus_action} { "menu-popdownsubmenus", (XtActionProc)gui_athena_popdown_submenus_action}
@ -65,16 +65,16 @@ static XtActionsRec pullAction[2] = {
#endif #endif
#ifdef FEAT_TOOLBAR #ifdef FEAT_TOOLBAR
static void gui_mch_reset_focus __ARGS((void)); static void gui_mch_reset_focus(void);
static Widget toolBar = (Widget)0; static Widget toolBar = (Widget)0;
#endif #endif
static void gui_athena_scroll_cb_jump __ARGS((Widget, XtPointer, XtPointer)); static void gui_athena_scroll_cb_jump(Widget, XtPointer, XtPointer);
static void gui_athena_scroll_cb_scroll __ARGS((Widget, XtPointer, XtPointer)); static void gui_athena_scroll_cb_scroll(Widget, XtPointer, XtPointer);
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_MENU) #if defined(FEAT_GUI_DIALOG) || defined(FEAT_MENU)
static void gui_athena_menu_colors __ARGS((Widget id)); static void gui_athena_menu_colors(Widget id);
#endif #endif
static void gui_athena_scroll_colors __ARGS((Widget id)); static void gui_athena_scroll_colors(Widget id);
#ifdef FEAT_MENU #ifdef FEAT_MENU
static XtTranslations popupTrans, parentTrans, menuTrans, supermenuTrans; static XtTranslations popupTrans, parentTrans, menuTrans, supermenuTrans;
@ -442,8 +442,8 @@ gui_x11_destroy_widgets()
# include <X11/xpm.h> # include <X11/xpm.h>
# endif # endif
static void createXpmImages __ARGS((char_u *path, char **xpm, Pixmap *sen)); static void createXpmImages(char_u *path, char **xpm, Pixmap *sen);
static void get_toolbar_pixmap __ARGS((vimmenu_T *menu, Pixmap *sen)); static void get_toolbar_pixmap(vimmenu_T *menu, Pixmap *sen);
/* /*
* Allocated a pixmap for toolbar menu "menu". * Allocated a pixmap for toolbar menu "menu".
@ -643,13 +643,13 @@ gui_x11_set_back_color()
* Menu stuff. * Menu stuff.
*/ */
static char_u *make_pull_name __ARGS((char_u * name)); static char_u *make_pull_name(char_u * name);
static Widget get_popup_entry __ARGS((Widget w)); static Widget get_popup_entry(Widget w);
static Widget submenu_widget __ARGS((Widget)); static Widget submenu_widget(Widget);
static Boolean has_submenu __ARGS((Widget)); static Boolean has_submenu(Widget);
static void gui_mch_submenu_change __ARGS((vimmenu_T *mp, int colors)); static void gui_mch_submenu_change(vimmenu_T *mp, int colors);
static void gui_athena_menu_font __ARGS((Widget id)); static void gui_athena_menu_font(Widget id);
static Boolean gui_athena_menu_has_submenus __ARGS((Widget, Widget)); static Boolean gui_athena_menu_has_submenus(Widget, Widget);
void void
gui_mch_enable_menu(flag) gui_mch_enable_menu(flag)
@ -2066,9 +2066,9 @@ gui_mch_browse(saving, title, dflt, ext, initdir, filter)
static int dialogStatus; static int dialogStatus;
static Atom dialogatom; static Atom dialogatom;
static void keyhit_callback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont)); static void keyhit_callback(Widget w, XtPointer client_data, XEvent *event, Boolean *cont);
static void butproc __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void butproc(Widget w, XtPointer client_data, XtPointer call_data);
static void dialog_wm_handler __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *dum)); static void dialog_wm_handler(Widget w, XtPointer client_data, XEvent *event, Boolean *dum);
/* /*
* Callback function for the textfield. When CR is hit this works like * Callback function for the textfield. When CR is hit this works like

36
src/gui_beval.c
View File

@ -160,26 +160,26 @@ static BalloonEval *current_beval = NULL;
#endif #endif
#ifdef FEAT_GUI_GTK #ifdef FEAT_GUI_GTK
static void addEventHandler __ARGS((GtkWidget *, BalloonEval *)); static void addEventHandler(GtkWidget *, BalloonEval *);
static void removeEventHandler __ARGS((BalloonEval *)); static void removeEventHandler(BalloonEval *);
static gint target_event_cb __ARGS((GtkWidget *, GdkEvent *, gpointer)); static gint target_event_cb(GtkWidget *, GdkEvent *, gpointer);
static gint mainwin_event_cb __ARGS((GtkWidget *, GdkEvent *, gpointer)); static gint mainwin_event_cb(GtkWidget *, GdkEvent *, gpointer);
static void pointer_event __ARGS((BalloonEval *, int, int, unsigned)); static void pointer_event(BalloonEval *, int, int, unsigned);
static void key_event __ARGS((BalloonEval *, unsigned, int)); static void key_event(BalloonEval *, unsigned, int);
static gint timeout_cb __ARGS((gpointer)); static gint timeout_cb(gpointer);
static gint balloon_expose_event_cb __ARGS((GtkWidget *, GdkEventExpose *, gpointer)); static gint balloon_expose_event_cb(GtkWidget *, GdkEventExpose *, gpointer);
#else #else
static void addEventHandler __ARGS((Widget, BalloonEval *)); static void addEventHandler(Widget, BalloonEval *);
static void removeEventHandler __ARGS((BalloonEval *)); static void removeEventHandler(BalloonEval *);
static void pointerEventEH __ARGS((Widget, XtPointer, XEvent *, Boolean *)); static void pointerEventEH(Widget, XtPointer, XEvent *, Boolean *);
static void pointerEvent __ARGS((BalloonEval *, XEvent *)); static void pointerEvent(BalloonEval *, XEvent *);
static void timerRoutine __ARGS((XtPointer, XtIntervalId *)); static void timerRoutine(XtPointer, XtIntervalId *);
#endif #endif
static void cancelBalloon __ARGS((BalloonEval *)); static void cancelBalloon(BalloonEval *);
static void requestBalloon __ARGS((BalloonEval *)); static void requestBalloon(BalloonEval *);
static void drawBalloon __ARGS((BalloonEval *)); static void drawBalloon(BalloonEval *);
static void undrawBalloon __ARGS((BalloonEval *beval)); static void undrawBalloon(BalloonEval *beval);
static void createBalloonEvalWindow __ARGS((BalloonEval *)); static void createBalloonEvalWindow(BalloonEval *);

64
src/gui_motif.c
View File

@ -83,29 +83,29 @@ static int tearoff_val = (int)XmTEAR_OFF_ENABLED;
static Widget menuBar; static Widget menuBar;
#endif #endif
static void scroll_cb __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void scroll_cb(Widget w, XtPointer client_data, XtPointer call_data);
#ifdef FEAT_GUI_TABLINE #ifdef FEAT_GUI_TABLINE
static void tabline_cb __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void tabline_cb(Widget w, XtPointer client_data, XtPointer call_data);
static void tabline_button_cb __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void tabline_button_cb(Widget w, XtPointer client_data, XtPointer call_data);
static void tabline_menu_cb __ARGS((Widget w, XtPointer closure, XEvent *e, Boolean *continue_dispatch)); static void tabline_menu_cb(Widget w, XtPointer closure, XEvent *e, Boolean *continue_dispatch);
static void tabline_balloon_cb __ARGS((BalloonEval *beval, int state)); static void tabline_balloon_cb(BalloonEval *beval, int state);
#endif #endif
#ifdef FEAT_TOOLBAR #ifdef FEAT_TOOLBAR
# ifdef FEAT_FOOTER # ifdef FEAT_FOOTER
static void toolbarbutton_enter_cb __ARGS((Widget, XtPointer, XEvent *, Boolean *)); static void toolbarbutton_enter_cb(Widget, XtPointer, XEvent *, Boolean *);
static void toolbarbutton_leave_cb __ARGS((Widget, XtPointer, XEvent *, Boolean *)); static void toolbarbutton_leave_cb(Widget, XtPointer, XEvent *, Boolean *);
# endif # endif
static void reset_focus __ARGS((void)); static void reset_focus(void);
#endif #endif
#ifdef FEAT_FOOTER #ifdef FEAT_FOOTER
static int gui_mch_compute_footer_height __ARGS((void)); static int gui_mch_compute_footer_height(void);
#endif #endif
#ifdef WSDEBUG #ifdef WSDEBUG
static void attachDump(Widget, char *); static void attachDump(Widget, char *);
#endif #endif
static void gui_motif_menu_colors __ARGS((Widget id)); static void gui_motif_menu_colors(Widget id);
static void gui_motif_scroll_colors __ARGS((Widget id)); static void gui_motif_scroll_colors(Widget id);
#if (XmVersion >= 1002) #if (XmVersion >= 1002)
# define STRING_TAG XmFONTLIST_DEFAULT_TAG # define STRING_TAG XmFONTLIST_DEFAULT_TAG
@ -310,7 +310,7 @@ tabline_balloon_cb(beval, state)
static XtExposeProc old_label_expose = NULL; static XtExposeProc old_label_expose = NULL;
static void label_expose __ARGS((Widget _w, XEvent *_event, Region _region)); static void label_expose(Widget _w, XEvent *_event, Region _region);
static void static void
label_expose(_w, _event, _region) label_expose(_w, _event, _region)
@ -777,14 +777,14 @@ gui_motif_fontset2fontlist(fontset)
* Menu stuff. * Menu stuff.
*/ */
static void gui_motif_add_actext __ARGS((vimmenu_T *menu)); static void gui_motif_add_actext(vimmenu_T *menu);
#if (XmVersion >= 1002) #if (XmVersion >= 1002)
static void toggle_tearoff __ARGS((Widget wid)); static void toggle_tearoff(Widget wid);
static void gui_mch_recurse_tearoffs __ARGS((vimmenu_T *menu)); static void gui_mch_recurse_tearoffs(vimmenu_T *menu);
#endif #endif
static void submenu_change __ARGS((vimmenu_T *mp, int colors)); static void submenu_change(vimmenu_T *mp, int colors);
static void do_set_mnemonics __ARGS((int enable)); static void do_set_mnemonics(int enable);
static int menu_enabled = TRUE; static int menu_enabled = TRUE;
void void
@ -1192,9 +1192,9 @@ gui_mch_compute_menu_height(id)
*/ */
#include "gui_x11_pm.h" #include "gui_x11_pm.h"
static int check_xpm __ARGS((char_u *path)); static int check_xpm(char_u *path);
static char **get_toolbar_pixmap __ARGS((vimmenu_T *menu, char **fname)); static char **get_toolbar_pixmap(vimmenu_T *menu, char **fname);
static int add_pixmap_args __ARGS((vimmenu_T *menu, Arg *args, int n)); static int add_pixmap_args(vimmenu_T *menu, Arg *args, int n);
/* /*
* Read an Xpm file. Return OK or FAIL. * Read an Xpm file. Return OK or FAIL.
@ -2124,7 +2124,7 @@ suppress_dialog_mnemonics(Widget dialog)
} }
#if defined(FEAT_BROWSE) || defined(FEAT_GUI_DIALOG) #if defined(FEAT_BROWSE) || defined(FEAT_GUI_DIALOG)
static void set_fontlist __ARGS((Widget wg)); static void set_fontlist(Widget wg);
/* /*
* Use the 'guifont' or 'guifontset' as a fontlist for a dialog widget. * Use the 'guifont' or 'guifontset' as a fontlist for a dialog widget.
@ -2197,8 +2197,8 @@ static char *browse_fname = NULL;
static XmStringCharSet charset = (XmStringCharSet) XmSTRING_DEFAULT_CHARSET; static XmStringCharSet charset = (XmStringCharSet) XmSTRING_DEFAULT_CHARSET;
/* used to set up XmStrings */ /* used to set up XmStrings */
static void DialogCancelCB __ARGS((Widget, XtPointer, XtPointer)); static void DialogCancelCB(Widget, XtPointer, XtPointer);
static void DialogAcceptCB __ARGS((Widget, XtPointer, XtPointer)); static void DialogAcceptCB(Widget, XtPointer, XtPointer);
/* /*
* This function is used to translate the predefined label text of the * This function is used to translate the predefined label text of the
@ -2209,7 +2209,7 @@ static void DialogAcceptCB __ARGS((Widget, XtPointer, XtPointer));
* - equalize the messages between different GUI implementations as far as * - equalize the messages between different GUI implementations as far as
* possible. * possible.
*/ */
static void set_predefined_label __ARGS((Widget parent, String name, char *new_label)); static void set_predefined_label(Widget parent, String name, char *new_label);
static void static void
set_predefined_label(parent, name, new_label) set_predefined_label(parent, name, new_label)
@ -2446,8 +2446,8 @@ DialogAcceptCB(w, client_data, call_data)
static int dialogStatus; static int dialogStatus;
static void keyhit_callback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont)); static void keyhit_callback(Widget w, XtPointer client_data, XEvent *event, Boolean *cont);
static void butproc __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void butproc(Widget w, XtPointer client_data, XtPointer call_data);
/* /*
* Callback function for the textfield. When CR is hit this works like * Callback function for the textfield. When CR is hit this works like
@ -3540,12 +3540,12 @@ typedef struct _SharedFindReplace
static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void find_replace_destroy_callback(Widget w, XtPointer client_data, XtPointer call_data);
static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void find_replace_dismiss_callback(Widget w, XtPointer client_data, XtPointer call_data);
static void entry_activate_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void entry_activate_callback(Widget w, XtPointer client_data, XtPointer call_data);
static void find_replace_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void find_replace_callback(Widget w, XtPointer client_data, XtPointer call_data);
static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event)); static void find_replace_keypress(Widget w, SharedFindReplace * frdp, XKeyEvent * event);
static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace)); static void find_replace_dialog_create(char_u *entry_text, int do_replace);
static void static void
find_replace_destroy_callback(w, client_data, call_data) find_replace_destroy_callback(w, client_data, call_data)

6
src/gui_w32.c
View File

@ -331,9 +331,9 @@ gui_mch_set_rendering_options(char_u *s)
# define UINT_PTR UINT # define UINT_PTR UINT
#endif #endif
static void make_tooltip __ARGS((BalloonEval *beval, char *text, POINT pt)); static void make_tooltip(BalloonEval *beval, char *text, POINT pt);
static void delete_tooltip __ARGS((BalloonEval *beval)); static void delete_tooltip(BalloonEval *beval);
static VOID CALLBACK BevalTimerProc __ARGS((HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)); static VOID CALLBACK BevalTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);
static BalloonEval *cur_beval = NULL; static BalloonEval *cur_beval = NULL;
static UINT_PTR BevalTimerId = 0; static UINT_PTR BevalTimerId = 0;

4
src/gui_w48.c
View File

@ -320,8 +320,8 @@ static OSVERSIONINFO os_version; /* like it says. Init in gui_mch_init() */
#ifdef FEAT_BEVAL #ifdef FEAT_BEVAL
/* balloon-eval WM_NOTIFY_HANDLER */ /* balloon-eval WM_NOTIFY_HANDLER */
static void Handle_WM_Notify __ARGS((HWND hwnd, LPNMHDR pnmh)); static void Handle_WM_Notify(HWND hwnd, LPNMHDR pnmh);
static void TrackUserActivity __ARGS((UINT uMsg)); static void TrackUserActivity(UINT uMsg);
#endif #endif
/* /*

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1197,
/**/ /**/
1196, 1196,
/**/ /**/