Mercurial > vim
diff src/window.c @ 7805:0b6c37dd858d v7.4.1199
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 29 22:47:03 2016 +0100
patch 7.4.1199
Problem: Still using __ARGS.
Solution: Remove __ARGS in several files. (script by Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 29 Jan 2016 23:00:05 +0100 |
| parents | 85a7a945fb87 |
| children | 33ba2adb6065 |
line wrap: on
line diff
--- a/src/window.c +++ b/src/window.c @@ -9,72 +9,72 @@ #include "vim.h" -static int path_is_url __ARGS((char_u *p)); +static int path_is_url(char_u *p); #if defined(FEAT_WINDOWS) || defined(PROTO) -static void cmd_with_count __ARGS((char *cmd, char_u *bufp, size_t bufsize, long Prenum)); -static void win_init __ARGS((win_T *newp, win_T *oldp, int flags)); -static void win_init_some __ARGS((win_T *newp, win_T *oldp)); -static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col)); -static void frame_setheight __ARGS((frame_T *curfrp, int height)); +static void cmd_with_count(char *cmd, char_u *bufp, size_t bufsize, long Prenum); +static void win_init(win_T *newp, win_T *oldp, int flags); +static void win_init_some(win_T *newp, win_T *oldp); +static void frame_comp_pos(frame_T *topfrp, int *row, int *col); +static void frame_setheight(frame_T *curfrp, int height); #ifdef FEAT_VERTSPLIT -static void frame_setwidth __ARGS((frame_T *curfrp, int width)); -#endif -static void win_exchange __ARGS((long)); -static void win_rotate __ARGS((int, int)); -static void win_totop __ARGS((int size, int flags)); -static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height)); -static int last_window __ARGS((void)); -static int close_last_window_tabpage __ARGS((win_T *win, int free_buf, tabpage_T *prev_curtab)); -static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp)); -static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp)); -static tabpage_T *alt_tabpage __ARGS((void)); -static win_T *frame2win __ARGS((frame_T *frp)); -static int frame_has_win __ARGS((frame_T *frp, win_T *wp)); -static void frame_new_height __ARGS((frame_T *topfrp, int height, int topfirst, int wfh)); -static int frame_fixed_height __ARGS((frame_T *frp)); +static void frame_setwidth(frame_T *curfrp, int width); +#endif +static void win_exchange(long); +static void win_rotate(int, int); +static void win_totop(int size, int flags); +static void win_equal_rec(win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height); +static int last_window(void); +static int close_last_window_tabpage(win_T *win, int free_buf, tabpage_T *prev_curtab); +static win_T *win_free_mem(win_T *win, int *dirp, tabpage_T *tp); +static frame_T *win_altframe(win_T *win, tabpage_T *tp); +static tabpage_T *alt_tabpage(void); +static win_T *frame2win(frame_T *frp); +static int frame_has_win(frame_T *frp, win_T *wp); +static void frame_new_height(frame_T *topfrp, int height, int topfirst, int wfh); +static int frame_fixed_height(frame_T *frp); #ifdef FEAT_VERTSPLIT -static int frame_fixed_width __ARGS((frame_T *frp)); -static void frame_add_statusline __ARGS((frame_T *frp)); -static void frame_new_width __ARGS((frame_T *topfrp, int width, int leftfirst, int wfw)); -static void frame_add_vsep __ARGS((frame_T *frp)); -static int frame_minwidth __ARGS((frame_T *topfrp, win_T *next_curwin)); -static void frame_fix_width __ARGS((win_T *wp)); -#endif -#endif -static int win_alloc_firstwin __ARGS((win_T *oldwin)); -static void new_frame __ARGS((win_T *wp)); +static int frame_fixed_width(frame_T *frp); +static void frame_add_statusline(frame_T *frp); +static void frame_new_width(frame_T *topfrp, int width, int leftfirst, int wfw); +static void frame_add_vsep(frame_T *frp); +static int frame_minwidth(frame_T *topfrp, win_T *next_curwin); +static void frame_fix_width(win_T *wp); +#endif +#endif +static int win_alloc_firstwin(win_T *oldwin); +static void new_frame(win_T *wp); #if defined(FEAT_WINDOWS) || defined(PROTO) -static tabpage_T *alloc_tabpage __ARGS((void)); -static int leave_tabpage __ARGS((buf_T *new_curbuf, int trigger_leave_autocmds)); -static void enter_tabpage __ARGS((tabpage_T *tp, buf_T *old_curbuf, int trigger_enter_autocmds, int trigger_leave_autocmds)); -static void frame_fix_height __ARGS((win_T *wp)); -static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin)); -static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin, int trigger_enter_autocmds, int trigger_leave_autocmds)); -static void win_free __ARGS((win_T *wp, tabpage_T *tp)); -static void frame_append __ARGS((frame_T *after, frame_T *frp)); -static void frame_insert __ARGS((frame_T *before, frame_T *frp)); -static void frame_remove __ARGS((frame_T *frp)); +static tabpage_T *alloc_tabpage(void); +static int leave_tabpage(buf_T *new_curbuf, int trigger_leave_autocmds); +static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, int trigger_enter_autocmds, int trigger_leave_autocmds); +static void frame_fix_height(win_T *wp); +static int frame_minheight(frame_T *topfrp, win_T *next_curwin); +static void win_enter_ext(win_T *wp, int undo_sync, int no_curwin, int trigger_enter_autocmds, int trigger_leave_autocmds); +static void win_free(win_T *wp, tabpage_T *tp); +static void frame_append(frame_T *after, frame_T *frp); +static void frame_insert(frame_T *before, frame_T *frp); +static void frame_remove(frame_T *frp); # ifdef FEAT_VERTSPLIT -static void win_goto_ver __ARGS((int up, long count)); -static void win_goto_hor __ARGS((int left, long count)); +static void win_goto_ver(int up, long count); +static void win_goto_hor(int left, long count); # endif -static void frame_add_height __ARGS((frame_T *frp, int n)); -static void last_status_rec __ARGS((frame_T *fr, int statusline)); - -static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp)); -static void clear_snapshot __ARGS((tabpage_T *tp, int idx)); -static void clear_snapshot_rec __ARGS((frame_T *fr)); -static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr)); -static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr)); - -static int frame_check_height __ARGS((frame_T *topfrp, int height)); +static void frame_add_height(frame_T *frp, int n); +static void last_status_rec(frame_T *fr, int statusline); + +static void make_snapshot_rec(frame_T *fr, frame_T **frp); +static void clear_snapshot(tabpage_T *tp, int idx); +static void clear_snapshot_rec(frame_T *fr); +static int check_snapshot_rec(frame_T *sn, frame_T *fr); +static win_T *restore_snapshot_rec(frame_T *sn, frame_T *fr); + +static int frame_check_height(frame_T *topfrp, int height); #ifdef FEAT_VERTSPLIT -static int frame_check_width __ARGS((frame_T *topfrp, int width)); +static int frame_check_width(frame_T *topfrp, int width); #endif #endif /* FEAT_WINDOWS */ -static win_T *win_alloc __ARGS((win_T *after, int hidden)); +static win_T *win_alloc(win_T *after, int hidden); #define URL_SLASH 1 /* path_is_url() has found "://" */ #define URL_BACKSLASH 2 /* path_is_url() has found ":\\" */ @@ -6372,7 +6372,7 @@ file_name_in_line(line, col, options, co } # if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) -static char_u *eval_includeexpr __ARGS((char_u *ptr, int len)); +static char_u *eval_includeexpr(char_u *ptr, int len); static char_u * eval_includeexpr(ptr, len)