mirror of
https://github.com/neovim/neovim.git
synced 2025-09-13 06:48:17 +00:00
Remove __ARGS macro. Close #205
This is a squash of all commits sent to #81. - Remove unused undef of __ARGS. - Fix mch_rename declaration. - Follow changes related to moved & extracted files. - Properly indent function declarations of getchar.h and quickfix.c.
This commit is contained in:
Nicolas Pierron
committed by
Thiago de Arruda
Thiago de Arruda
parent
2bd6d44403
commit
d9283c4927
214
src/normal.c
214
src/normal.c
@@ -57,118 +57,118 @@ static int VIsual_mode_orig = NUL; /* type of Visual mode, that use
|
||||
|
||||
static int restart_VIsual_select = 0;
|
||||
|
||||
static void set_vcount_ca __ARGS((cmdarg_T *cap, int *set_prevcount));
|
||||
static void set_vcount_ca(cmdarg_T *cap, int *set_prevcount);
|
||||
static int
|
||||
nv_compare __ARGS((const void *s1, const void *s2));
|
||||
static int find_command __ARGS((int cmdchar));
|
||||
static void op_colon __ARGS((oparg_T *oap));
|
||||
static void op_function __ARGS((oparg_T *oap));
|
||||
static void find_start_of_word __ARGS((pos_T *));
|
||||
static void find_end_of_word __ARGS((pos_T *));
|
||||
static int get_mouse_class __ARGS((char_u *p));
|
||||
static void prep_redo_cmd __ARGS((cmdarg_T *cap));
|
||||
static void prep_redo __ARGS((int regname, long, int, int, int, int, int));
|
||||
static int checkclearop __ARGS((oparg_T *oap));
|
||||
static int checkclearopq __ARGS((oparg_T *oap));
|
||||
static void clearop __ARGS((oparg_T *oap));
|
||||
static void clearopbeep __ARGS((oparg_T *oap));
|
||||
static void unshift_special __ARGS((cmdarg_T *cap));
|
||||
static void del_from_showcmd __ARGS((int));
|
||||
nv_compare(const void *s1, const void *s2);
|
||||
static int find_command(int cmdchar);
|
||||
static void op_colon(oparg_T *oap);
|
||||
static void op_function(oparg_T *oap);
|
||||
static void find_start_of_word(pos_T *);
|
||||
static void find_end_of_word(pos_T *);
|
||||
static int get_mouse_class(char_u *p);
|
||||
static void prep_redo_cmd(cmdarg_T *cap);
|
||||
static void prep_redo(int regname, long, int, int, int, int, int);
|
||||
static int checkclearop(oparg_T *oap);
|
||||
static int checkclearopq(oparg_T *oap);
|
||||
static void clearop(oparg_T *oap);
|
||||
static void clearopbeep(oparg_T *oap);
|
||||
static void unshift_special(cmdarg_T *cap);
|
||||
static void del_from_showcmd(int);
|
||||
|
||||
/*
|
||||
* nv_*(): functions called to handle Normal and Visual mode commands.
|
||||
* n_*(): functions called to handle Normal mode commands.
|
||||
* v_*(): functions called to handle Visual mode commands.
|
||||
*/
|
||||
static void nv_ignore __ARGS((cmdarg_T *cap));
|
||||
static void nv_nop __ARGS((cmdarg_T *cap));
|
||||
static void nv_error __ARGS((cmdarg_T *cap));
|
||||
static void nv_help __ARGS((cmdarg_T *cap));
|
||||
static void nv_addsub __ARGS((cmdarg_T *cap));
|
||||
static void nv_page __ARGS((cmdarg_T *cap));
|
||||
static void nv_gd __ARGS((oparg_T *oap, int nchar, int thisblock));
|
||||
static int nv_screengo __ARGS((oparg_T *oap, int dir, long dist));
|
||||
static void nv_mousescroll __ARGS((cmdarg_T *cap));
|
||||
static void nv_mouse __ARGS((cmdarg_T *cap));
|
||||
static void nv_scroll_line __ARGS((cmdarg_T *cap));
|
||||
static void nv_zet __ARGS((cmdarg_T *cap));
|
||||
static void nv_exmode __ARGS((cmdarg_T *cap));
|
||||
static void nv_colon __ARGS((cmdarg_T *cap));
|
||||
static void nv_ctrlg __ARGS((cmdarg_T *cap));
|
||||
static void nv_ctrlh __ARGS((cmdarg_T *cap));
|
||||
static void nv_clear __ARGS((cmdarg_T *cap));
|
||||
static void nv_ctrlo __ARGS((cmdarg_T *cap));
|
||||
static void nv_hat __ARGS((cmdarg_T *cap));
|
||||
static void nv_Zet __ARGS((cmdarg_T *cap));
|
||||
static void nv_ident __ARGS((cmdarg_T *cap));
|
||||
static void nv_tagpop __ARGS((cmdarg_T *cap));
|
||||
static void nv_scroll __ARGS((cmdarg_T *cap));
|
||||
static void nv_right __ARGS((cmdarg_T *cap));
|
||||
static void nv_left __ARGS((cmdarg_T *cap));
|
||||
static void nv_up __ARGS((cmdarg_T *cap));
|
||||
static void nv_down __ARGS((cmdarg_T *cap));
|
||||
static void nv_gotofile __ARGS((cmdarg_T *cap));
|
||||
static void nv_end __ARGS((cmdarg_T *cap));
|
||||
static void nv_dollar __ARGS((cmdarg_T *cap));
|
||||
static void nv_search __ARGS((cmdarg_T *cap));
|
||||
static void nv_next __ARGS((cmdarg_T *cap));
|
||||
static void normal_search __ARGS((cmdarg_T *cap, int dir, char_u *pat, int opt));
|
||||
static void nv_csearch __ARGS((cmdarg_T *cap));
|
||||
static void nv_brackets __ARGS((cmdarg_T *cap));
|
||||
static void nv_percent __ARGS((cmdarg_T *cap));
|
||||
static void nv_brace __ARGS((cmdarg_T *cap));
|
||||
static void nv_mark __ARGS((cmdarg_T *cap));
|
||||
static void nv_findpar __ARGS((cmdarg_T *cap));
|
||||
static void nv_undo __ARGS((cmdarg_T *cap));
|
||||
static void nv_kundo __ARGS((cmdarg_T *cap));
|
||||
static void nv_Replace __ARGS((cmdarg_T *cap));
|
||||
static void nv_vreplace __ARGS((cmdarg_T *cap));
|
||||
static void v_swap_corners __ARGS((int cmdchar));
|
||||
static void nv_replace __ARGS((cmdarg_T *cap));
|
||||
static void n_swapchar __ARGS((cmdarg_T *cap));
|
||||
static void nv_cursormark __ARGS((cmdarg_T *cap, int flag, pos_T *pos));
|
||||
static void v_visop __ARGS((cmdarg_T *cap));
|
||||
static void nv_subst __ARGS((cmdarg_T *cap));
|
||||
static void nv_abbrev __ARGS((cmdarg_T *cap));
|
||||
static void nv_optrans __ARGS((cmdarg_T *cap));
|
||||
static void nv_gomark __ARGS((cmdarg_T *cap));
|
||||
static void nv_pcmark __ARGS((cmdarg_T *cap));
|
||||
static void nv_regname __ARGS((cmdarg_T *cap));
|
||||
static void nv_visual __ARGS((cmdarg_T *cap));
|
||||
static void n_start_visual_mode __ARGS((int c));
|
||||
static void nv_window __ARGS((cmdarg_T *cap));
|
||||
static void nv_suspend __ARGS((cmdarg_T *cap));
|
||||
static void nv_g_cmd __ARGS((cmdarg_T *cap));
|
||||
static void n_opencmd __ARGS((cmdarg_T *cap));
|
||||
static void nv_dot __ARGS((cmdarg_T *cap));
|
||||
static void nv_redo __ARGS((cmdarg_T *cap));
|
||||
static void nv_Undo __ARGS((cmdarg_T *cap));
|
||||
static void nv_tilde __ARGS((cmdarg_T *cap));
|
||||
static void nv_operator __ARGS((cmdarg_T *cap));
|
||||
static void set_op_var __ARGS((int optype));
|
||||
static void nv_lineop __ARGS((cmdarg_T *cap));
|
||||
static void nv_home __ARGS((cmdarg_T *cap));
|
||||
static void nv_pipe __ARGS((cmdarg_T *cap));
|
||||
static void nv_bck_word __ARGS((cmdarg_T *cap));
|
||||
static void nv_wordcmd __ARGS((cmdarg_T *cap));
|
||||
static void nv_beginline __ARGS((cmdarg_T *cap));
|
||||
static void adjust_cursor __ARGS((oparg_T *oap));
|
||||
static void adjust_for_sel __ARGS((cmdarg_T *cap));
|
||||
static int unadjust_for_sel __ARGS((void));
|
||||
static void nv_select __ARGS((cmdarg_T *cap));
|
||||
static void nv_goto __ARGS((cmdarg_T *cap));
|
||||
static void nv_normal __ARGS((cmdarg_T *cap));
|
||||
static void nv_esc __ARGS((cmdarg_T *oap));
|
||||
static void nv_edit __ARGS((cmdarg_T *cap));
|
||||
static void invoke_edit __ARGS((cmdarg_T *cap, int repl, int cmd, int startln));
|
||||
static void nv_object __ARGS((cmdarg_T *cap));
|
||||
static void nv_record __ARGS((cmdarg_T *cap));
|
||||
static void nv_at __ARGS((cmdarg_T *cap));
|
||||
static void nv_halfpage __ARGS((cmdarg_T *cap));
|
||||
static void nv_join __ARGS((cmdarg_T *cap));
|
||||
static void nv_put __ARGS((cmdarg_T *cap));
|
||||
static void nv_open __ARGS((cmdarg_T *cap));
|
||||
static void nv_cursorhold __ARGS((cmdarg_T *cap));
|
||||
static void nv_ignore(cmdarg_T *cap);
|
||||
static void nv_nop(cmdarg_T *cap);
|
||||
static void nv_error(cmdarg_T *cap);
|
||||
static void nv_help(cmdarg_T *cap);
|
||||
static void nv_addsub(cmdarg_T *cap);
|
||||
static void nv_page(cmdarg_T *cap);
|
||||
static void nv_gd(oparg_T *oap, int nchar, int thisblock);
|
||||
static int nv_screengo(oparg_T *oap, int dir, long dist);
|
||||
static void nv_mousescroll(cmdarg_T *cap);
|
||||
static void nv_mouse(cmdarg_T *cap);
|
||||
static void nv_scroll_line(cmdarg_T *cap);
|
||||
static void nv_zet(cmdarg_T *cap);
|
||||
static void nv_exmode(cmdarg_T *cap);
|
||||
static void nv_colon(cmdarg_T *cap);
|
||||
static void nv_ctrlg(cmdarg_T *cap);
|
||||
static void nv_ctrlh(cmdarg_T *cap);
|
||||
static void nv_clear(cmdarg_T *cap);
|
||||
static void nv_ctrlo(cmdarg_T *cap);
|
||||
static void nv_hat(cmdarg_T *cap);
|
||||
static void nv_Zet(cmdarg_T *cap);
|
||||
static void nv_ident(cmdarg_T *cap);
|
||||
static void nv_tagpop(cmdarg_T *cap);
|
||||
static void nv_scroll(cmdarg_T *cap);
|
||||
static void nv_right(cmdarg_T *cap);
|
||||
static void nv_left(cmdarg_T *cap);
|
||||
static void nv_up(cmdarg_T *cap);
|
||||
static void nv_down(cmdarg_T *cap);
|
||||
static void nv_gotofile(cmdarg_T *cap);
|
||||
static void nv_end(cmdarg_T *cap);
|
||||
static void nv_dollar(cmdarg_T *cap);
|
||||
static void nv_search(cmdarg_T *cap);
|
||||
static void nv_next(cmdarg_T *cap);
|
||||
static void normal_search(cmdarg_T *cap, int dir, char_u *pat, int opt);
|
||||
static void nv_csearch(cmdarg_T *cap);
|
||||
static void nv_brackets(cmdarg_T *cap);
|
||||
static void nv_percent(cmdarg_T *cap);
|
||||
static void nv_brace(cmdarg_T *cap);
|
||||
static void nv_mark(cmdarg_T *cap);
|
||||
static void nv_findpar(cmdarg_T *cap);
|
||||
static void nv_undo(cmdarg_T *cap);
|
||||
static void nv_kundo(cmdarg_T *cap);
|
||||
static void nv_Replace(cmdarg_T *cap);
|
||||
static void nv_vreplace(cmdarg_T *cap);
|
||||
static void v_swap_corners(int cmdchar);
|
||||
static void nv_replace(cmdarg_T *cap);
|
||||
static void n_swapchar(cmdarg_T *cap);
|
||||
static void nv_cursormark(cmdarg_T *cap, int flag, pos_T *pos);
|
||||
static void v_visop(cmdarg_T *cap);
|
||||
static void nv_subst(cmdarg_T *cap);
|
||||
static void nv_abbrev(cmdarg_T *cap);
|
||||
static void nv_optrans(cmdarg_T *cap);
|
||||
static void nv_gomark(cmdarg_T *cap);
|
||||
static void nv_pcmark(cmdarg_T *cap);
|
||||
static void nv_regname(cmdarg_T *cap);
|
||||
static void nv_visual(cmdarg_T *cap);
|
||||
static void n_start_visual_mode(int c);
|
||||
static void nv_window(cmdarg_T *cap);
|
||||
static void nv_suspend(cmdarg_T *cap);
|
||||
static void nv_g_cmd(cmdarg_T *cap);
|
||||
static void n_opencmd(cmdarg_T *cap);
|
||||
static void nv_dot(cmdarg_T *cap);
|
||||
static void nv_redo(cmdarg_T *cap);
|
||||
static void nv_Undo(cmdarg_T *cap);
|
||||
static void nv_tilde(cmdarg_T *cap);
|
||||
static void nv_operator(cmdarg_T *cap);
|
||||
static void set_op_var(int optype);
|
||||
static void nv_lineop(cmdarg_T *cap);
|
||||
static void nv_home(cmdarg_T *cap);
|
||||
static void nv_pipe(cmdarg_T *cap);
|
||||
static void nv_bck_word(cmdarg_T *cap);
|
||||
static void nv_wordcmd(cmdarg_T *cap);
|
||||
static void nv_beginline(cmdarg_T *cap);
|
||||
static void adjust_cursor(oparg_T *oap);
|
||||
static void adjust_for_sel(cmdarg_T *cap);
|
||||
static int unadjust_for_sel(void);
|
||||
static void nv_select(cmdarg_T *cap);
|
||||
static void nv_goto(cmdarg_T *cap);
|
||||
static void nv_normal(cmdarg_T *cap);
|
||||
static void nv_esc(cmdarg_T *oap);
|
||||
static void nv_edit(cmdarg_T *cap);
|
||||
static void invoke_edit(cmdarg_T *cap, int repl, int cmd, int startln);
|
||||
static void nv_object(cmdarg_T *cap);
|
||||
static void nv_record(cmdarg_T *cap);
|
||||
static void nv_at(cmdarg_T *cap);
|
||||
static void nv_halfpage(cmdarg_T *cap);
|
||||
static void nv_join(cmdarg_T *cap);
|
||||
static void nv_put(cmdarg_T *cap);
|
||||
static void nv_open(cmdarg_T *cap);
|
||||
static void nv_cursorhold(cmdarg_T *cap);
|
||||
|
||||
static char *e_noident = N_("E349: No identifier under cursor");
|
||||
|
||||
@@ -176,7 +176,7 @@ static char *e_noident = N_("E349: No identifier under cursor");
|
||||
* Function to be called for a Normal or Visual mode command.
|
||||
* The argument is a cmdarg_T.
|
||||
*/
|
||||
typedef void (*nv_func_T) __ARGS ((cmdarg_T *cap));
|
||||
typedef void (*nv_func_T)(cmdarg_T *cap);
|
||||
|
||||
/* Values for cmd_flags. */
|
||||
#define NV_NCH 0x01 /* may need to get a second char */
|
||||
@@ -2987,7 +2987,7 @@ static char_u old_showcmd_buf[SHOWCMD_BUFLEN]; /* For push_showcmd() */
|
||||
static int showcmd_is_clear = TRUE;
|
||||
static int showcmd_visual = FALSE;
|
||||
|
||||
static void display_showcmd __ARGS((void));
|
||||
static void display_showcmd(void);
|
||||
|
||||
void clear_showcmd(void) {
|
||||
if (!p_sc)
|
||||
|
||||
Reference in New Issue
Block a user