diff options
author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-03-02 14:11:35 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-02 14:19:59 -0300 |
commit | d9283c4927cc5f926fa796acc2568610bd9a80d6 (patch) | |
tree | ee22db97987af38c538d1bd6501a384203579949 /src/option.c | |
parent | 2bd6d444033b5746595713f4d037de135379a23e (diff) | |
download | rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.tar.gz rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.tar.bz2 rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.zip |
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.
Diffstat (limited to 'src/option.c')
-rw-r--r-- | src/option.c | 111 |
1 files changed, 55 insertions, 56 deletions
diff --git a/src/option.c b/src/option.c index 50335cd9db..375a8f6f4e 100644 --- a/src/option.c +++ b/src/option.c @@ -1893,60 +1893,59 @@ static char *(p_fdm_values[]) = {"manual", "expr", "marker", "indent", "syntax", static char *(p_fcl_values[]) = {"all", NULL}; static char *(p_cot_values[]) = {"menu", "menuone", "longest", "preview", NULL}; -static void set_option_default __ARGS((int, int opt_flags, int compatible)); -static void set_options_default __ARGS((int opt_flags)); -static char_u *term_bg_default __ARGS((void)); -static void did_set_option __ARGS((int opt_idx, int opt_flags, int new_value)); -static char_u *illegal_char __ARGS((char_u *, int)); -static int string_to_key __ARGS((char_u *arg)); -static char_u *check_cedit __ARGS((void)); -static void did_set_title __ARGS((int icon)); -static char_u *option_expand __ARGS((int opt_idx, char_u *val)); -static void didset_options __ARGS((void)); -static void check_string_option __ARGS((char_u **pp)); -static long_u *insecure_flag __ARGS((int opt_idx, int opt_flags)); -static void set_string_option_global __ARGS((int opt_idx, char_u **varp)); -static char_u *set_string_option __ARGS((int opt_idx, char_u *value, - int opt_flags)); -static char_u *did_set_string_option __ARGS((int opt_idx, char_u **varp, - int new_value_alloced, char_u * - oldval, char_u *errbuf, - int opt_flags)); -static char_u *set_chars_option __ARGS((char_u **varp)); -static int int_cmp __ARGS((const void *a, const void *b)); -static char_u *compile_cap_prog __ARGS((synblock_T *synblock)); -static void set_option_scriptID_idx __ARGS((int opt_idx, int opt_flags, int id)); -static char_u *set_bool_option __ARGS((int opt_idx, char_u *varp, int value, - int opt_flags)); -static char_u *set_num_option __ARGS((int opt_idx, char_u *varp, long value, - char_u *errbuf, size_t errbuflen, - int opt_flags)); -static void check_redraw __ARGS((long_u flags)); -static int findoption __ARGS((char_u *)); -static int find_key_option __ARGS((char_u *)); -static void showoptions __ARGS((int all, int opt_flags)); -static int optval_default __ARGS((struct vimoption *, char_u *varp)); -static void showoneopt __ARGS((struct vimoption *, int opt_flags)); -static int put_setstring __ARGS((FILE *fd, char *cmd, char *name, char_u * - *valuep, - int expand)); -static int put_setnum __ARGS((FILE *fd, char *cmd, char *name, long *valuep)); -static int put_setbool __ARGS((FILE *fd, char *cmd, char *name, int value)); -static int istermoption __ARGS((struct vimoption *)); -static char_u *get_varp_scope __ARGS((struct vimoption *p, int opt_flags)); -static char_u *get_varp __ARGS((struct vimoption *)); -static void option_value2string __ARGS((struct vimoption *, int opt_flags)); -static int wc_use_keyname __ARGS((char_u *varp, long *wcp)); -static void langmap_init __ARGS((void)); -static void langmap_set __ARGS((void)); -static void paste_option_changed __ARGS((void)); -static void compatible_set __ARGS((void)); -static void fill_breakat_flags __ARGS((void)); -static int opt_strings_flags __ARGS((char_u *val, char **values, - unsigned *flagp, - int list)); -static int check_opt_strings __ARGS((char_u *val, char **values, int)); -static int check_opt_wim __ARGS((void)); +static void set_option_default(int, int opt_flags, int compatible); +static void set_options_default(int opt_flags); +static char_u *term_bg_default(void); +static void did_set_option(int opt_idx, int opt_flags, int new_value); +static char_u *illegal_char(char_u *, int); +static int string_to_key(char_u *arg); +static char_u *check_cedit(void); +static void did_set_title(int icon); +static char_u *option_expand(int opt_idx, char_u *val); +static void didset_options(void); +static void check_string_option(char_u **pp); +static long_u *insecure_flag(int opt_idx, int opt_flags); +static void set_string_option_global(int opt_idx, char_u **varp); +static char_u *set_string_option(int opt_idx, char_u *value, + int opt_flags); +static char_u *did_set_string_option(int opt_idx, char_u **varp, + int new_value_alloced, + char_u *oldval, char_u *errbuf, + int opt_flags); +static char_u *set_chars_option(char_u **varp); +static int int_cmp(const void *a, const void *b); +static char_u *compile_cap_prog(synblock_T *synblock); +static void set_option_scriptID_idx(int opt_idx, int opt_flags, int id); +static char_u *set_bool_option(int opt_idx, char_u *varp, int value, + int opt_flags); +static char_u *set_num_option(int opt_idx, char_u *varp, long value, + char_u *errbuf, size_t errbuflen, + int opt_flags); +static void check_redraw(long_u flags); +static int findoption(char_u *); +static int find_key_option(char_u *); +static void showoptions(int all, int opt_flags); +static int optval_default(struct vimoption *, char_u *varp); +static void showoneopt(struct vimoption *, int opt_flags); +static int put_setstring(FILE *fd, char *cmd, char *name, char_u **valuep, + int expand); +static int put_setnum(FILE *fd, char *cmd, char *name, long *valuep); +static int put_setbool(FILE *fd, char *cmd, char *name, int value); +static int istermoption(struct vimoption *); +static char_u *get_varp_scope(struct vimoption *p, int opt_flags); +static char_u *get_varp(struct vimoption *); +static void option_value2string(struct vimoption *, int opt_flags); +static int wc_use_keyname(char_u *varp, long *wcp); +static void langmap_init(void); +static void langmap_set(void); +static void paste_option_changed(void); +static void compatible_set(void); +static void fill_breakat_flags(void); +static int opt_strings_flags(char_u *val, char **values, + unsigned *flagp, + int list); +static int check_opt_strings(char_u *val, char **values, int); +static int check_opt_wim(void); /* * Initialize the options, first part. @@ -3759,7 +3758,7 @@ static long_u *insecure_flag(int opt_idx, int opt_flags) return &options[opt_idx].flags; } -static void redraw_titles __ARGS((void)); +static void redraw_titles(void); /* * Redraw the window title and/or tab page text later. @@ -7637,7 +7636,7 @@ typedef struct { } langmap_entry_T; static garray_T langmap_mapga; -static void langmap_set_entry __ARGS((int from, int to)); +static void langmap_set_entry(int from, int to); /* * Search for an entry in "langmap_mapga" for "from". If found set the "to" |