From ff5258c3c69e2b772bb7e3ee14b83f526b99ca4d Mon Sep 17 00:00:00 2001 From: edyfox Date: Mon, 18 May 2009 03:55:54 +0000 Subject: [PATCH] Merged from the latest developing branch. git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1475 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- src/buffer.c | 7 +- src/edit.c | 8 - src/eval.c | 253 ++++++------------ src/ex_cmds.c | 9 +- src/ex_cmds2.c | 8 +- src/ex_docmd.c | 19 +- src/ex_eval.c | 9 +- src/ex_getln.c | 2 +- src/farsi.c | 15 +- src/fileio.c | 11 +- src/gui.c | 16 +- src/gui_beval.c | 12 +- src/gui_gtk.c | 60 ++--- src/gui_gtk_f.c | 33 ++- src/gui_gtk_x11.c | 201 +++++++------- src/hardcopy.c | 18 +- src/if_cscope.c | 26 +- src/if_mzsch.c | 6 +- src/if_xcmdsrv.c | 21 +- src/macros.h | 2 +- src/main.c | 9 +- src/mark.c | 6 +- src/mbyte.c | 81 +++--- src/menu.c | 16 +- src/message.c | 36 +-- src/misc1.c | 9 +- src/misc2.c | 19 +- src/netbeans.c | 23 +- src/normal.c | 7 +- src/option.c | 761 ++++++++++++++++++++++++++++-------------------------- src/os_unix.c | 65 ++--- src/os_unix.h | 4 +- src/quickfix.c | 3 +- src/screen.c | 13 +- src/search.c | 3 +- src/spell.c | 22 +- src/structs.h | 4 - src/syntax.c | 46 ++-- src/tag.c | 4 +- src/term.c | 4 +- src/term.h | 4 - src/ui.c | 24 +- src/version.c | 16 ++ 43 files changed, 857 insertions(+), 1058 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 050760fe..2d64bca8 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2025,13 +2025,12 @@ buflist_findname_stat(ffname, stp) * Return fnum of the found buffer. * Return < 0 for error. */ -/*ARGSUSED*/ int buflist_findpat(pattern, pattern_end, unlisted, diffmode) char_u *pattern; char_u *pattern_end; /* pointer to first char after pattern */ int unlisted; /* find unlisted buffers */ - int diffmode; /* find diff-mode buffers only */ + int diffmode UNUSED; /* find diff-mode buffers only */ { buf_T *buf; regprog_T *prog; @@ -2539,7 +2538,6 @@ buflist_findlnum(buf) /* * List all know file names (for :files and :buffers command). */ -/*ARGSUSED*/ void buflist_list(eap) exarg_T *eap; @@ -3346,14 +3344,13 @@ free_titles() * If maxwidth is not zero, the string will be filled at any middle marker * or truncated if too long, fillchar is used for all whitespace. */ -/*ARGSUSED*/ int build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab) win_T *wp; char_u *out; /* buffer to write into != NameBuff */ size_t outlen; /* length of out[] */ char_u *fmt; - int use_sandbox; /* "fmt" was set insecurely, use sandbox */ + int use_sandbox UNUSED; /* "fmt" was set insecurely, use sandbox */ int fillchar; int maxwidth; struct stl_hlrec *hltab; /* return: HL attributes (can be NULL) */ diff --git a/src/edit.c b/src/edit.c index ee30a3e3..4cb727cd 100644 --- a/src/edit.c +++ b/src/edit.c @@ -69,11 +69,7 @@ struct compl_S compl_T *cp_prev; char_u *cp_str; /* matched text */ char cp_icase; /* TRUE or FALSE: ignore case */ -#ifdef S_SPLINT_S /* splint can't handle array of pointers */ - char_u **cp_text; /* text for the menu */ -#else char_u *(cp_text[CPT_COUNT]); /* text for the menu */ -#endif char_u *cp_fname; /* file containing the match, allocated when * cp_flags has FREE_FNAME */ int cp_flags; /* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */ @@ -3835,11 +3831,7 @@ ins_compl_add_tv(tv, dir) char_u *word; int icase = FALSE; int adup = FALSE; -#ifdef S_SPLINT_S /* splint doesn't parse array of pointers correctly */ - char_u **cptext; -#else char_u *(cptext[CPT_COUNT]); -#endif if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL) { diff --git a/src/eval.c b/src/eval.c index 00e199fb..3f231b64 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3772,7 +3772,6 @@ cat_prefix_varname(prefix, name) * Function given to ExpandGeneric() to obtain the list of user defined * (global/buffer/window/built-in) variable names. */ -/*ARGSUSED*/ char_u * get_user_var_name(xp, idx) expand_T *xp; @@ -7787,7 +7786,6 @@ get_function_name(xp, idx) * Function given to ExpandGeneric() to obtain the list of internal or * user defined variable or function names. */ -/*ARGSUSED*/ char_u * get_expr_name(xp, idx) expand_T *xp; @@ -8655,10 +8653,9 @@ f_bufwinnr(argvars, rettv) /* * "byte2line(byte)" function */ -/*ARGSUSED*/ static void f_byte2line(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifndef FEAT_BYTEOFF @@ -8678,7 +8675,6 @@ f_byte2line(argvars, rettv) /* * "byteidx()" function */ -/*ARGSUSED*/ static void f_byteidx(argvars, rettv) typval_T *argvars; @@ -8852,7 +8848,7 @@ f_cindent(argvars, rettv) static void f_clearmatches(argvars, rettv) typval_T *argvars UNUSED; - typval_T *rettv; + typval_T *rettv UNUSED; { #ifdef FEAT_SEARCH_EXTRA clear_matches(curwin); @@ -8916,11 +8912,10 @@ f_col(argvars, rettv) /* * "complete()" function */ -/*ARGSUSED*/ static void f_complete(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { int startcol; @@ -8951,7 +8946,6 @@ f_complete(argvars, rettv) /* * "complete_add()" function */ -/*ARGSUSED*/ static void f_complete_add(argvars, rettv) typval_T *argvars; @@ -8963,10 +8957,9 @@ f_complete_add(argvars, rettv) /* * "complete_check()" function */ -/*ARGSUSED*/ static void f_complete_check(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int saved = RedrawingDisabled; @@ -8981,11 +8974,10 @@ f_complete_check(argvars, rettv) /* * "confirm(message, buttons[, default [, type]])" function */ -/*ARGSUSED*/ static void f_confirm(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) char_u *message; @@ -9150,11 +9142,10 @@ f_count(argvars, rettv) * * Checks the existence of a cscope connection. */ -/*ARGSUSED*/ static void f_cscope_connection(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_CSCOPE int num = 0; @@ -9181,7 +9172,6 @@ f_cscope_connection(argvars, rettv) * Moves the cursor to the specified line and column. * Returns 0 when the position could be set, -1 otherwise. */ -/*ARGSUSED*/ static void f_cursor(argvars, rettv) typval_T *argvars; @@ -9275,11 +9265,10 @@ f_delete(argvars, rettv) /* * "did_filetype()" function */ -/*ARGSUSED*/ static void f_did_filetype(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_AUTOCMD rettv->vval.v_number = did_filetype; @@ -9289,11 +9278,10 @@ f_did_filetype(argvars, rettv) /* * "diff_filler()" function */ -/*ARGSUSED*/ static void f_diff_filler(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_DIFF rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars)); @@ -9303,11 +9291,10 @@ f_diff_filler(argvars, rettv) /* * "diff_hlID()" function */ -/*ARGSUSED*/ static void f_diff_hlID(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_DIFF linenr_T lnum = get_tv_lnum(argvars); @@ -9420,7 +9407,6 @@ f_escape(argvars, rettv) /* * "eval()" function */ -/*ARGSUSED*/ static void f_eval(argvars, rettv) typval_T *argvars; @@ -9444,10 +9430,9 @@ f_eval(argvars, rettv) /* * "eventhandler()" function */ -/*ARGSUSED*/ static void f_eventhandler(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = vgetc_busy; @@ -9704,11 +9689,10 @@ f_extend(argvars, rettv) /* * "feedkeys()" function */ -/*ARGSUSED*/ static void f_feedkeys(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { int remap = TRUE; char_u *keys, *flags; @@ -10210,10 +10194,9 @@ f_foldlevel(argvars, rettv) /* * "foldtext()" function */ -/*ARGSUSED*/ static void f_foldtext(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_FOLDING @@ -10278,10 +10261,9 @@ f_foldtext(argvars, rettv) /* * "foldtextresult(lnum)" function */ -/*ARGSUSED*/ static void f_foldtextresult(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_FOLDING @@ -10314,11 +10296,10 @@ f_foldtextresult(argvars, rettv) /* * "foreground()" function */ -/*ARGSUSED*/ static void f_foreground(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_GUI if (gui.in_use) @@ -10333,7 +10314,6 @@ f_foreground(argvars, rettv) /* * "function()" function */ -/*ARGSUSED*/ static void f_function(argvars, rettv) typval_T *argvars; @@ -10357,11 +10337,10 @@ f_function(argvars, rettv) /* * "garbagecollect()" function */ -/*ARGSUSED*/ static void f_garbagecollect(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { /* This is postponed until we are back at the toplevel, because we may be * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */ @@ -10664,10 +10643,9 @@ f_getchar(argvars, rettv) /* * "getcharmod()" function */ -/*ARGSUSED*/ static void f_getcharmod(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = mod_mask; @@ -10676,10 +10654,9 @@ f_getcharmod(argvars, rettv) /* * "getcmdline()" function */ -/*ARGSUSED*/ static void f_getcmdline(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -10689,10 +10666,9 @@ f_getcmdline(argvars, rettv) /* * "getcmdpos()" function */ -/*ARGSUSED*/ static void f_getcmdpos(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = get_cmdline_pos() + 1; @@ -10701,10 +10677,9 @@ f_getcmdpos(argvars, rettv) /* * "getcmdtype()" function */ -/*ARGSUSED*/ static void f_getcmdtype(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -10719,10 +10694,9 @@ f_getcmdtype(argvars, rettv) /* * "getcwd()" function */ -/*ARGSUSED*/ static void f_getcwd(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u cwd[MAXPATHL]; @@ -10743,10 +10717,9 @@ f_getcwd(argvars, rettv) /* * "getfontname()" function */ -/*ARGSUSED*/ static void f_getfontname(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -10973,10 +10946,9 @@ f_getline(argvars, rettv) /* * "getmatches()" function */ -/*ARGSUSED*/ static void f_getmatches(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_SEARCH_EXTRA @@ -11004,10 +10976,9 @@ f_getmatches(argvars, rettv) /* * "getpid()" function */ -/*ARGSUSED*/ static void f_getpid(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = mch_get_pid(); @@ -11051,11 +11022,10 @@ f_getpos(argvars, rettv) /* * "getqflist()" and "getloclist()" functions */ -/*ARGSUSED*/ static void f_getqflist(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_QUICKFIX win_T *wp; @@ -11170,10 +11140,9 @@ f_gettabwinvar(argvars, rettv) /* * "getwinposx()" function */ -/*ARGSUSED*/ static void f_getwinposx(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = -1; @@ -11191,10 +11160,9 @@ f_getwinposx(argvars, rettv) /* * "getwinposy()" function */ -/*ARGSUSED*/ static void f_getwinposy(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = -1; @@ -11921,10 +11889,9 @@ f_has_key(argvars, rettv) /* * "haslocaldir()" function */ -/*ARGSUSED*/ static void f_haslocaldir(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = (curwin->w_localdir != NULL); @@ -11962,10 +11929,9 @@ f_hasmapto(argvars, rettv) /* * "histadd()" function */ -/*ARGSUSED*/ static void f_histadd(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CMDHIST @@ -11996,11 +11962,10 @@ f_histadd(argvars, rettv) /* * "histdel()" function */ -/*ARGSUSED*/ static void f_histdel(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_CMDHIST int n; @@ -12028,10 +11993,9 @@ f_histdel(argvars, rettv) /* * "histget()" function */ -/*ARGSUSED*/ static void f_histget(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CMDHIST @@ -12061,10 +12025,9 @@ f_histget(argvars, rettv) /* * "histnr()" function */ -/*ARGSUSED*/ static void f_histnr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int i; @@ -12106,10 +12069,9 @@ f_hlexists(argvars, rettv) /* * "hostname()" function */ -/*ARGSUSED*/ static void f_hostname(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u hostname[256]; @@ -12122,10 +12084,9 @@ f_hostname(argvars, rettv) /* * iconv() function */ -/*ARGSUSED*/ static void f_iconv(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_MBYTE @@ -12420,10 +12381,9 @@ static garray_T ga_userinput = {0, 0, sizeof(tasave_T), 4, NULL}; /* * "inputrestore()" function */ -/*ARGSUSED*/ static void f_inputrestore(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { if (ga_userinput.ga_len > 0) @@ -12443,10 +12403,9 @@ f_inputrestore(argvars, rettv) /* * "inputsave()" function */ -/*ARGSUSED*/ static void f_inputsave(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { /* Add an entry to the stack of typeahead storage. */ @@ -12733,10 +12692,9 @@ f_keys(argvars, rettv) /* * "last_buffer_nr()" function. */ -/*ARGSUSED*/ static void f_last_buffer_nr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int n = 0; @@ -12863,10 +12821,9 @@ f_line(argvars, rettv) /* * "line2byte(lnum)" function */ -/*ARGSUSED*/ static void f_line2byte(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifndef FEAT_BYTEOFF @@ -12912,10 +12869,9 @@ f_lispindent(argvars, rettv) /* * "localtime()" function */ -/*ARGSUSED*/ static void f_localtime(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = (varnumber_T)time(NULL); @@ -13497,7 +13453,6 @@ f_mkdir(argvars, rettv) /* * "mode()" function */ -/*ARGSUSED*/ static void f_mode(argvars, rettv) typval_T *argvars; @@ -13726,11 +13681,10 @@ f_printf(argvars, rettv) /* * "pumvisible()" function */ -/*ARGSUSED*/ static void f_pumvisible(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_INS_EXPAND if (pum_visible()) @@ -14131,10 +14085,9 @@ remote_common(argvars, rettv, expr) /* * "remote_expr()" function */ -/*ARGSUSED*/ static void f_remote_expr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -14147,11 +14100,10 @@ f_remote_expr(argvars, rettv) /* * "remote_foreground()" function */ -/*ARGSUSED*/ static void f_remote_foreground(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_CLIENTSERVER # ifdef WIN32 @@ -14173,10 +14125,9 @@ f_remote_foreground(argvars, rettv) #endif } -/*ARGSUSED*/ static void f_remote_peek(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CLIENTSERVER @@ -14231,10 +14182,9 @@ f_remote_peek(argvars, rettv) #endif } -/*ARGSUSED*/ static void f_remote_read(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *r = NULL; @@ -14266,10 +14216,9 @@ f_remote_read(argvars, rettv) /* * "remote_send()" function */ -/*ARGSUSED*/ static void f_remote_send(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -14398,7 +14347,6 @@ f_rename(argvars, rettv) /* * "repeat()" function */ -/*ARGSUSED*/ static void f_repeat(argvars, rettv) typval_T *argvars; @@ -15207,10 +15155,9 @@ f_searchpos(argvars, rettv) } -/*ARGSUSED*/ static void f_server2client(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CLIENTSERVER @@ -15239,10 +15186,9 @@ f_server2client(argvars, rettv) #endif } -/*ARGSUSED*/ static void f_serverlist(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *r = NULL; @@ -15263,11 +15209,10 @@ f_serverlist(argvars, rettv) /* * "setbufvar()" function */ -/*ARGSUSED*/ static void f_setbufvar(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { buf_T *buf; aco_save_T aco; @@ -15402,12 +15347,11 @@ static void set_qf_ll_list __ARGS((win_T *wp, typval_T *list_arg, typval_T *acti /* * Used by "setqflist()" and "setloclist()" functions */ -/*ARGSUSED*/ static void set_qf_ll_list(wp, list_arg, action_arg, rettv) - win_T *wp; - typval_T *list_arg; - typval_T *action_arg; + win_T *wp UNUSED; + typval_T *list_arg UNUSED; + typval_T *action_arg UNUSED; typval_T *rettv; { #ifdef FEAT_QUICKFIX @@ -15442,7 +15386,6 @@ set_qf_ll_list(wp, list_arg, action_arg, rettv) /* * "setloclist()" function */ -/*ARGSUSED*/ static void f_setloclist(argvars, rettv) typval_T *argvars; @@ -15520,7 +15463,6 @@ f_setmatches(argvars, rettv) /* * "setpos()" function */ -/*ARGSUSED*/ static void f_setpos(argvars, rettv) typval_T *argvars; @@ -15564,7 +15506,6 @@ f_setpos(argvars, rettv) /* * "setqflist()" function */ -/*ARGSUSED*/ static void f_setqflist(argvars, rettv) typval_T *argvars; @@ -15667,11 +15608,10 @@ f_setwinvar(argvars, rettv) /* * "setwinvar()" and "settabwinvar()" functions */ -/*ARGSUSED*/ static void setwinvar(argvars, rettv, off) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; int off; { win_T *win; @@ -15987,10 +15927,9 @@ f_soundfold(argvars, rettv) /* * "spellbadword()" function */ -/* ARGSUSED */ static void f_spellbadword(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *word = (char_u *)""; @@ -16042,10 +15981,9 @@ f_spellbadword(argvars, rettv) /* * "spellsuggest()" function */ -/*ARGSUSED*/ static void f_spellsuggest(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_SPELL @@ -16528,10 +16466,9 @@ f_substitute(argvars, rettv) /* * "synID(lnum, col, trans)" function */ -/*ARGSUSED*/ static void f_synID(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int id = 0; @@ -16556,10 +16493,9 @@ f_synID(argvars, rettv) /* * "synIDattr(id, what [, mode])" function */ -/*ARGSUSED*/ static void f_synIDattr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *p = NULL; @@ -16652,10 +16588,9 @@ f_synIDattr(argvars, rettv) /* * "synIDtrans(id)" function */ -/*ARGSUSED*/ static void f_synIDtrans(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int id; @@ -16675,10 +16610,9 @@ f_synIDtrans(argvars, rettv) /* * "synstack(lnum, col)" function */ -/*ARGSUSED*/ static void f_synstack(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_SYN_HL @@ -16812,11 +16746,10 @@ done: /* * "tabpagebuflist()" function */ -/* ARGSUSED */ static void f_tabpagebuflist(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_WINDOWS tabpage_T *tp; @@ -16844,10 +16777,9 @@ f_tabpagebuflist(argvars, rettv) /* * "tabpagenr()" function */ -/* ARGSUSED */ static void f_tabpagenr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int nr = 1; @@ -16929,10 +16861,9 @@ get_winnr(tp, argvar) /* * "tabpagewinnr()" function */ -/* ARGSUSED */ static void f_tabpagewinnr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int nr = 1; @@ -16952,10 +16883,9 @@ f_tabpagewinnr(argvars, rettv) /* * "tagfiles()" function */ -/*ARGSUSED*/ static void f_tagfiles(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u fname[MAXPATHL + 1]; @@ -16995,10 +16925,9 @@ f_taglist(argvars, rettv) /* * "tempname()" function */ -/*ARGSUSED*/ static void f_tempname(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { static int x = 'A'; @@ -17031,11 +16960,10 @@ f_tempname(argvars, rettv) /* * "test(list)" function: Just checking the walls... */ -/*ARGSUSED*/ static void f_test(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { /* Used for unit testing. Change the code below to your liking. */ #if 0 @@ -17320,11 +17248,10 @@ f_virtcol(argvars, rettv) /* * "visualmode()" function */ -/*ARGSUSED*/ static void f_visualmode(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_VISUAL char_u str[2]; @@ -17360,10 +17287,9 @@ f_winbufnr(argvars, rettv) /* * "wincol()" function */ -/*ARGSUSED*/ static void f_wincol(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { validate_cursor(); @@ -17390,10 +17316,9 @@ f_winheight(argvars, rettv) /* * "winline()" function */ -/*ARGSUSED*/ static void f_winline(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { validate_cursor(); @@ -17403,10 +17328,9 @@ f_winline(argvars, rettv) /* * "winnr()" function */ -/* ARGSUSED */ static void f_winnr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int nr = 1; @@ -17420,10 +17344,9 @@ f_winnr(argvars, rettv) /* * "winrestcmd()" function */ -/* ARGSUSED */ static void f_winrestcmd(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_WINDOWS @@ -17455,11 +17378,10 @@ f_winrestcmd(argvars, rettv) /* * "winrestview()" function */ -/* ARGSUSED */ static void f_winrestview(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { dict_T *dict; @@ -17501,10 +17423,9 @@ f_winrestview(argvars, rettv) /* * "winsaveview()" function */ -/* ARGSUSED */ static void f_winsaveview(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { dict_T *dict; @@ -21646,12 +21567,11 @@ get_return_cmd(rettv) * Called by do_cmdline() to get the next line. * Returns allocated string, or NULL for end of function. */ -/* ARGSUSED */ char_u * get_func_line(c, cookie, indent) - int c; /* not used */ + int c UNUSED; void *cookie; - int indent; /* not used */ + int indent UNUSED; { funccall_T *fcp = (funccall_T *)cookie; ufunc_T *fp = fcp->func; @@ -22023,10 +21943,9 @@ last_set_msg(scriptID) /* * List v:oldfiles in a nice way. */ -/*ARGSUSED*/ void ex_oldfiles(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { list_T *l = vimvars[VV_OLDFILES].vv_list; listitem_T *li; diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 8a0a9ec1..fabb2e76 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2255,12 +2255,11 @@ viminfo_readline(virp) * * Return the string in allocated memory (NULL when out of memory). */ -/*ARGSUSED*/ char_u * viminfo_readstring(virp, off, convert) vir_T *virp; int off; /* offset for virp->vir_line */ - int convert; /* convert the string */ + int convert UNUSED; /* convert the string */ { char_u *retval; char_u *s, *d; @@ -2736,7 +2735,6 @@ theend: * May set eap->forceit if a dialog says it's OK to overwrite. * Return OK if it's OK, FAIL if it is not. */ -/*ARGSUSED*/ static int check_overwrite(eap, buf, fname, ffname, other) exarg_T *eap; @@ -5776,10 +5774,6 @@ find_help_tags(arg, num_matches, matches, keep_lang) { char_u *s, *d; int i; -#ifdef S_SPLINT_S /* splint doesn't understand array of pointers */ - static char **mtable; - static char **rtable; -#else static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*", "/*", "/\\*", "\"*", "**", "/\\(\\)", @@ -5794,7 +5788,6 @@ find_help_tags(arg, num_matches, matches, keep_lang) "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=", "\\[count]", "\\[quotex]", "\\[range]", "\\[pattern]", "\\\\bar", "/\\\\%\\$"}; -#endif int flags; d = IObuff; /* assume IObuff is long enough! */ diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index bfa322d8..1108ab96 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -28,7 +28,8 @@ typedef struct scriptitem_S { char_u *sn_name; # ifdef UNIX - int sn_dev; + int sn_dev_valid; + dev_t sn_dev; ino_t sn_ino; # endif # ifdef FEAT_PROFILE @@ -3049,7 +3050,7 @@ do_source(fname, check_other, is_vimrc) /* Compare dev/ino when possible, it catches symbolic * links. Also compare file names, the inode may change * when the file was edited. */ - ((stat_ok && si->sn_dev != -1) + ((stat_ok && si->sn_dev_valid) && (si->sn_dev == st.st_dev && si->sn_ino == st.st_ino)) || # endif @@ -3076,11 +3077,12 @@ do_source(fname, check_other, is_vimrc) # ifdef UNIX if (stat_ok) { + si->sn_dev_valid = TRUE; si->sn_dev = st.st_dev; si->sn_ino = st.st_ino; } else - si->sn_dev = -1; + si->sn_dev_valid = FALSE; # endif /* Allocate the local script variables to use for this script. */ diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 15ec54cc..54d5b2db 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3004,7 +3004,7 @@ modifier_len(cmd) if (VIM_ISDIGIT(*cmd)) p = skipwhite(skipdigits(cmd)); - for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) + for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) { for (j = 0; p[j] != NUL; ++j) if (p[j] != cmdmods[i].name[j]) @@ -3032,7 +3032,7 @@ cmd_exists(name) char_u *p; /* Check command modifiers. */ - for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) + for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) { for (j = 0; name[j] != NUL; ++j) if (name[j] != cmdmods[i].name[j]) @@ -6093,7 +6093,7 @@ get_user_cmd_flags(xp, idx) {"bang", "bar", "buffer", "complete", "count", "nargs", "range", "register"}; - if (idx >= sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0])) + if (idx >= (int)(sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0]))) return NULL; return (char_u *)user_cmd_flags[idx]; } @@ -6108,7 +6108,7 @@ get_user_cmd_nargs(xp, idx) { static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; - if (idx >= sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0])) + if (idx >= (int)(sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0]))) return NULL; return (char_u *)user_cmd_nargs[idx]; } @@ -9144,10 +9144,9 @@ ex_startinsert(eap) /* * ":stopinsert" */ -/*ARGSUSED*/ static void ex_stopinsert(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { restart_edit = 0; stop_insert_mode = TRUE; @@ -9395,13 +9394,7 @@ find_cmdline_var(src, usedlen) { int len; int i; -#ifdef S_SPLINT_S /* splint can't handle array of pointers */ - static char **spec_str; - static char *(nospec_str[]) -#else - static char *(spec_str[]) -#endif - = { + static char *(spec_str[]) = { "%", #define SPEC_PERC 0 "#", diff --git a/src/ex_eval.c b/src/ex_eval.c index a821ef85..fc23cace 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -60,7 +60,9 @@ static char_u *get_end_emsg __ARGS((struct condstack *cstack)); #else /* Values used for the Vim release. */ # define THROW_ON_ERROR TRUE +# define THROW_ON_ERROR_TRUE # define THROW_ON_INTERRUPT TRUE +# define THROW_ON_INTERRUPT_TRUE #endif static void catch_exception __ARGS((except_T *excp)); @@ -1320,16 +1322,20 @@ do_throw(cstack) * and reset the did_emsg or got_int flag, so this won't happen again at * the next surrounding try conditional. */ +#ifndef THROW_ON_ERROR_TRUE if (did_emsg && !THROW_ON_ERROR) { inactivate_try = TRUE; did_emsg = FALSE; } +#endif +#ifndef THROW_ON_INTERRUPT_TRUE if (got_int && !THROW_ON_INTERRUPT) { inactivate_try = TRUE; got_int = FALSE; } +#endif idx = cleanup_conditionals(cstack, 0, inactivate_try); if (idx >= 0) { @@ -2254,10 +2260,9 @@ rewind_conditionals(cstack, idx, cond_type, cond_level) /* * ":endfunction" when not after a ":function" */ -/*ARGSUSED*/ void ex_endfunction(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { EMSG(_("E193: :endfunction not inside a function")); } diff --git a/src/ex_getln.c b/src/ex_getln.c index 26bf766c..cef83921 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4533,7 +4533,7 @@ ExpandFromContext(xp, pat, num_file, file, options) * right function to do the expansion. */ ret = FAIL; - for (i = 0; i < sizeof(tab) / sizeof(struct expgen); ++i) + for (i = 0; i < (int)(sizeof(tab) / sizeof(struct expgen)); ++i) if (xp->xp_context == tab[i].context) { if (tab[i].ic) diff --git a/src/farsi.c b/src/farsi.c index 7fee615f..271e1a72 100644 --- a/src/farsi.c +++ b/src/farsi.c @@ -103,7 +103,8 @@ toF_Xor_X_(c) case F_HE: tempc = _HE; - if (p_ri && (curwin->w_cursor.col+1 < STRLEN(ml_get_curline()))) + if (p_ri && (curwin->w_cursor.col + 1 + < (colnr_T)STRLEN(ml_get_curline()))) { inc_cursor(); @@ -344,7 +345,7 @@ put_curr_and_l_to_X(c) if (curwin->w_p_rl && p_ri) return; - if ( (curwin->w_cursor.col < STRLEN(ml_get_curline()))) + if ((curwin->w_cursor.col < (colnr_T)STRLEN(ml_get_curline()))) { if ((p_ri && curwin->w_cursor.col) || !p_ri) { @@ -565,7 +566,7 @@ chg_c_to_X_or_X () tempc = gchar_cursor(); - if (curwin->w_cursor.col+1 < STRLEN(ml_get_curline())) + if (curwin->w_cursor.col + 1 < (colnr_T)STRLEN(ml_get_curline())) { inc_cursor(); @@ -594,8 +595,8 @@ chg_l_to_X_orX_ () { int tempc; - if (!curwin->w_cursor.col && - (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) + if (curwin->w_cursor.col != 0 && + (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) return; if (!curwin->w_cursor.col && p_ri) @@ -663,8 +664,8 @@ chg_l_toXor_X () { int tempc; - if (!curwin->w_cursor.col && - (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) + if (curwin->w_cursor.col != 0 && + (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) return; if (!curwin->w_cursor.col && p_ri) diff --git a/src/fileio.c b/src/fileio.c index 4dcbd8e3..d1908631 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -9085,12 +9085,11 @@ auto_next_pat(apc, stop_at_last) * Called by do_cmdline() to get the next line for ":if". * Returns allocated string, or NULL for end of autocommands. */ -/* ARGSUSED */ static char_u * getnextac(c, cookie, indent) - int c; /* not used */ + int c UNUSED; void *cookie; - int indent; /* not used */ + int indent UNUSED; { AutoPatCmd *acp = (AutoPatCmd *)cookie; char_u *retval; @@ -9201,10 +9200,9 @@ has_autocmd(event, sfname, buf) * Function given to ExpandGeneric() to obtain the list of autocommand group * names. */ -/*ARGSUSED*/ char_u * get_augroup_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { if (idx == augroups.ga_len) /* add "END" add the end */ @@ -9270,10 +9268,9 @@ set_context_in_autocmd(xp, arg, doautocmd) /* * Function given to ExpandGeneric() to obtain the list of event names. */ -/*ARGSUSED*/ char_u * get_event_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { if (idx < augroups.ga_len) /* First list group names, if wanted */ diff --git a/src/gui.c b/src/gui.c index bcc3c68b..a80c9aa7 100644 --- a/src/gui.c +++ b/src/gui.c @@ -678,11 +678,10 @@ gui_shell_closed() * Return OK when able to set the font. When it failed FAIL is returned and * the fonts are unchanged. */ -/*ARGSUSED*/ int gui_init_font(font_list, fontset) char_u *font_list; - int fontset; + int fontset UNUSED; { #define FONTLEN 320 char_u font_name[FONTLEN]; @@ -1138,10 +1137,9 @@ gui_position_menu() * Position the various GUI components (text area, menu). The vertical * scrollbars are NOT handled here. See gui_update_scrollbars(). */ -/*ARGSUSED*/ static void gui_position_components(total_width) - int total_width; + int total_width UNUSED; { int text_area_x; int text_area_y; @@ -1374,10 +1372,9 @@ gui_get_shellsize() * If "fit_to_display" is TRUE then the size may be reduced to fit the window * on the screen. */ -/*ARGSUSED*/ void gui_set_shellsize(mustset, fit_to_display, direction) - int mustset; /* set by the user */ + int mustset UNUSED; /* set by the user */ int fit_to_display; int direction; /* RESIZE_HOR, RESIZE_VER */ { @@ -3120,7 +3117,6 @@ static int prev_which_scrollbars[3]; * If "oldval" is not NULL, "oldval" is the previous value, the new value is * in p_go. */ -/*ARGSUSED*/ void gui_init_which_components(oldval) char_u *oldval; @@ -4411,7 +4407,7 @@ gui_do_horiz_scroll() if (curwin->w_p_wrap) return FALSE; - if (curwin->w_leftcol == scrollbar_value) + if ((long_u)curwin->w_leftcol == scrollbar_value) return FALSE; curwin->w_leftcol = (colnr_T)scrollbar_value; @@ -4424,7 +4420,7 @@ gui_do_horiz_scroll() && longest_lnum < curwin->w_botline && !virtual_active()) { - if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum)) + if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum)) { curwin->w_cursor.lnum = longest_lnum; curwin->w_cursor.col = 0; @@ -4670,7 +4666,6 @@ gui_mouse_correct() /* * Find window where the mouse pointer "y" coordinate is in. */ -/*ARGSUSED*/ static win_T * xy2win(x, y) int x; @@ -5124,7 +5119,6 @@ gui_wingoto_xy(x, y) * of dropped files, they will be freed in this function, and caller can't use * fnames after call this function. */ -/*ARGSUSED*/ void gui_handle_drop(x, y, modifiers, fnames, count) int x; diff --git a/src/gui_beval.c b/src/gui_beval.c index e0d7b9c9..796103c7 100644 --- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -15,7 +15,6 @@ /* * Common code, invoked when the mouse is resting for a moment. */ -/*ARGSUSED*/ void general_beval_cb(beval, state) BalloonEval *beval; @@ -551,9 +550,8 @@ target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) return FALSE; /* continue emission */ } -/*ARGSUSED*/ static gint -mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) +mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data) { BalloonEval *beval = (BalloonEval *)data; @@ -663,9 +661,10 @@ timeout_cb(gpointer data) return FALSE; /* don't call me again */ } -/*ARGSUSED2*/ static gint -balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) +balloon_expose_event_cb(GtkWidget *widget, + GdkEventExpose *event, + gpointer data UNUSED) { gtk_paint_flat_box(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, @@ -676,7 +675,6 @@ balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) } # ifndef HAVE_GTK2 -/*ARGSUSED2*/ static void balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data) { @@ -726,7 +724,6 @@ removeEventHandler(beval) /* * The X event handler. All it does is call the real event handler. */ -/*ARGSUSED*/ static void pointerEventEH(w, client_data, event, unused) Widget w; @@ -877,7 +874,6 @@ pointerEvent(beval, event) } } -/*ARGSUSED*/ static void timerRoutine(dx, id) XtPointer dx; diff --git a/src/gui_gtk.c b/src/gui_gtk.c index cdfe78bd..0535e204 100644 --- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -285,14 +285,14 @@ create_menu_icon(vimmenu_T *menu, GtkIconSize icon_size) return image; } -/*ARGSUSED*/ static gint -toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) +toolbar_button_focus_in_event(GtkWidget *widget UNUSED, + GdkEventFocus *event UNUSED, + gpointer data UNUSED) { - /* When we're in a GtkPlug, we don't have window focus events, only widget focus. - * To emulate stand-alone gvim, if a button gets focus (e.g., into GtkPlug) - * immediately pass it to mainwin. - */ + /* When we're in a GtkPlug, we don't have window focus events, only widget + * focus. To emulate stand-alone gvim, if a button gets focus (e.g., + * into GtkPlug) immediately pass it to mainwin. */ if (gtk_socket_id != 0) gtk_widget_grab_focus(gui.drawarea); @@ -585,9 +585,8 @@ gui_mch_add_menu(vimmenu_T *menu, int idx) gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle); } -/*ARGSUSED*/ static void -menu_item_activate(GtkWidget *widget, gpointer data) +menu_item_activate(GtkWidget *widget UNUSED, gpointer data) { gui_menu_cb((vimmenu_T *)data); @@ -1202,9 +1201,8 @@ gui_mch_destroy_scrollbar(scrollbar_T *sb) #endif #ifndef USE_FILE_CHOOSER -/*ARGSUSED*/ static void -browse_ok_cb(GtkWidget *widget, gpointer cbdata) +browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata) { gui_T *vw = (gui_T *)cbdata; @@ -1218,9 +1216,8 @@ browse_ok_cb(GtkWidget *widget, gpointer cbdata) gtk_main_quit(); } -/*ARGSUSED*/ static void -browse_cancel_cb(GtkWidget *widget, gpointer cbdata) +browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata) { gui_T *vw = (gui_T *)cbdata; @@ -1234,9 +1231,8 @@ browse_cancel_cb(GtkWidget *widget, gpointer cbdata) gtk_main_quit(); } -/*ARGSUSED*/ static gboolean -browse_destroy_cb(GtkWidget * widget) +browse_destroy_cb(GtkWidget *widget UNUSED) { if (gui.browse_fname != NULL) { @@ -1262,14 +1258,13 @@ browse_destroy_cb(GtkWidget * widget) * initdir initial directory, NULL for current dir * filter not used (file name filter) */ -/*ARGSUSED*/ char_u * -gui_mch_browse(int saving, +gui_mch_browse(int saving UNUSED, char_u *title, char_u *dflt, - char_u *ext, + char_u *ext UNUSED, char_u *initdir, - char_u *filter) + char_u *filter UNUSED) { #ifdef USE_FILE_CHOOSER GtkWidget *fc; @@ -1377,7 +1372,6 @@ gui_mch_browse(int saving, * dflt default name * initdir initial directory, NULL for current dir */ -/*ARGSUSED*/ char_u * gui_mch_browsedir( char_u *title, @@ -1460,7 +1454,6 @@ dlg_destroy(GtkWidget *dlg) } # ifdef FEAT_GUI_GNOME -/* ARGSUSED */ static int gui_gnome_dialog( int type, char_u *title, @@ -1611,7 +1604,6 @@ typedef struct _CancelData GtkWidget *dialog; } CancelData; -/* ARGSUSED */ static void dlg_button_clicked(GtkWidget * widget, ButtonData *data) { @@ -1622,7 +1614,6 @@ dlg_button_clicked(GtkWidget * widget, ButtonData *data) /* * This makes the Escape key equivalent to the cancel button. */ -/*ARGSUSED*/ static int dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data) { @@ -1655,7 +1646,6 @@ dlg_destroy_cb(int *p) gtk_main_quit(); } -/* ARGSUSED */ int gui_mch_dialog( int type, /* type of dialog */ char_u *title, /* title of dialog */ @@ -2215,7 +2205,6 @@ typedef struct _DialogInfo GtkDialog *dialog; /* Widget of the dialog */ } DialogInfo; -/*ARGSUSED2*/ static gboolean dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { @@ -2398,14 +2387,13 @@ static int popup_mouse_pos; * Note: The push_in output argument seems to affect scrolling of huge * menus that don't fit on the screen. Leave it at the default for now. */ -/*ARGSUSED0*/ static void -popup_menu_position_func(GtkMenu *menu, +popup_menu_position_func(GtkMenu *menu UNUSED, gint *x, gint *y, # ifdef HAVE_GTK2 - gboolean *push_in, + gboolean *push_in UNUSED, # endif - gpointer user_data) + gpointer user_data UNUSED) { gdk_window_get_origin(gui.drawarea->window, x, y); @@ -2464,13 +2452,12 @@ typedef struct _SharedFindReplace GtkWidget *all; /* 'Replace All' action button */ } SharedFindReplace; -static SharedFindReplace find_widgets = { NULL, }; -static SharedFindReplace repl_widgets = { NULL, }; +static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; -/* ARGSUSED */ static int find_key_press_event( - GtkWidget *widget, + GtkWidget *widget UNUSED, GdkEventKey *event, SharedFindReplace *frdp) { @@ -2962,9 +2949,8 @@ gui_gtk_synch_fonts(void) /* * Callback for actions of the find and replace dialogs */ -/*ARGSUSED*/ static void -find_replace_cb(GtkWidget *widget, gpointer data) +find_replace_cb(GtkWidget *widget UNUSED, gpointer data) { int flags; char_u *find_text; @@ -3010,9 +2996,8 @@ find_replace_cb(GtkWidget *widget, gpointer data) } /* our usual callback function */ -/*ARGSUSED*/ static void -entry_activate_cb(GtkWidget *widget, gpointer data) +entry_activate_cb(GtkWidget *widget UNUSED, gpointer data) { gtk_widget_grab_focus(GTK_WIDGET(data)); } @@ -3055,10 +3040,9 @@ entry_changed_cb(GtkWidget * entry, GtkWidget * dialog) /* * ":helpfind" */ -/*ARGSUSED*/ void ex_helpfind(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { /* This will fail when menus are not loaded. Well, it's only for * backwards compatibility anyway. */ diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c index a19d69a1..d88499e2 100644 --- a/src/gui_gtk_f.c +++ b/src/gui_gtk_f.c @@ -227,14 +227,14 @@ gtk_form_get_type(void) if (!form_type) { - GtkTypeInfo form_info = - { - "GtkForm", - sizeof(GtkForm), - sizeof(GtkFormClass), - (GtkClassInitFunc) gtk_form_class_init, - (GtkObjectInitFunc) gtk_form_init - }; + GtkTypeInfo form_info; + + vim_memset(&form_info, 0, sizeof(form_info)); + form_info.type_name = "GtkForm"; + form_info.object_size = sizeof(GtkForm); + form_info.class_size = sizeof(GtkFormClass); + form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init; + form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init; form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info); } @@ -611,10 +611,9 @@ gtk_form_remove(GtkContainer *container, GtkWidget *widget) } } -/*ARGSUSED1*/ static void gtk_form_forall(GtkContainer *container, - gboolean include_internals, + gboolean include_internals UNUSED, GtkCallback callback, gpointer callback_data) { @@ -786,9 +785,8 @@ gtk_form_position_children(GtkForm *form) * them or discards them, depending on whether we are obscured * or not. */ -/*ARGSUSED1*/ static GdkFilterReturn -gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) +gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data) { XEvent *xevent; GtkForm *form; @@ -821,9 +819,10 @@ gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) * there is no corresponding event in GTK, so we have * to get the events from a filter */ -/*ARGSUSED1*/ static GdkFilterReturn -gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) +gtk_form_main_filter(GdkXEvent *gdk_xevent, + GdkEvent *event UNUSED, + gpointer data) { XEvent *xevent; GtkForm *form; @@ -911,9 +910,8 @@ gtk_form_send_configure(GtkForm *form) #endif } -/*ARGSUSED0*/ static void -gtk_form_child_map(GtkWidget *widget, gpointer user_data) +gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data) { GtkFormChild *child; @@ -923,9 +921,8 @@ gtk_form_child_map(GtkWidget *widget, gpointer user_data) gdk_window_show(child->window); } -/*ARGSUSED0*/ static void -gtk_form_child_unmap(GtkWidget *widget, gpointer user_data) +gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data) { GtkFormChild *child; diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index cd655576..d7f5103e 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -619,9 +619,10 @@ gui_mch_free_all() * Doesn't seem possible, since check_copy_area() relies on * this information. --danielk */ -/*ARGSUSED*/ static gint -visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data) +visibility_event(GtkWidget *widget UNUSED, + GdkEventVisibility *event, + gpointer data UNUSED) { gui.visibility = event->state; /* @@ -638,9 +639,10 @@ visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data) /* * Redraw the corresponding portions of the screen. */ -/*ARGSUSED*/ static gint -expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) +expose_event(GtkWidget *widget UNUSED, + GdkEventExpose *event, + gpointer data UNUSED) { /* Skip this when the GUI isn't set up yet, will redraw later. */ if (gui.starting) @@ -668,9 +670,10 @@ expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) /* * Handle changes to the "Comm" property */ -/*ARGSUSED2*/ static gint -property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data) +property_event(GtkWidget *widget, + GdkEventProperty *event, + gpointer data UNUSED) { if (event->type == GDK_PROPERTY_NOTIFY && event->state == (int)GDK_PROPERTY_NEW_VALUE @@ -740,9 +743,8 @@ gui_mch_stop_blink(void) blink_state = BLINK_NONE; } -/*ARGSUSED*/ static gint -blink_cb(gpointer data) +blink_cb(gpointer data UNUSED) { if (blink_state == BLINK_ON) { @@ -781,9 +783,10 @@ gui_mch_start_blink(void) } } -/*ARGSUSED*/ static gint -enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data) +enter_notify_event(GtkWidget *widget UNUSED, + GdkEventCrossing *event UNUSED, + gpointer data UNUSED) { if (blink_state == BLINK_NONE) gui_mch_start_blink(); @@ -795,9 +798,10 @@ enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data) return FALSE; } -/*ARGSUSED*/ static gint -leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data) +leave_notify_event(GtkWidget *widget UNUSED, + GdkEventCrossing *event UNUSED, + gpointer data UNUSED) { if (blink_state != BLINK_NONE) gui_mch_stop_blink(); @@ -805,9 +809,10 @@ leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data) return FALSE; } -/*ARGSUSED*/ static gint -focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) +focus_in_event(GtkWidget *widget, + GdkEventFocus *event UNUSED, + gpointer data UNUSED) { gui_focus_change(TRUE); @@ -826,9 +831,10 @@ focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) return TRUE; } -/*ARGSUSED*/ static gint -focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) +focus_out_event(GtkWidget *widget UNUSED, + GdkEventFocus *event UNUSED, + gpointer data UNUSED) { gui_focus_change(FALSE); @@ -956,9 +962,10 @@ modifiers_gdk2mouse(guint state) /* * Main keyboard handler: */ -/*ARGSUSED*/ static gint -key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +key_press_event(GtkWidget *widget UNUSED, + GdkEventKey *event, + gpointer data UNUSED) { #ifdef HAVE_GTK2 /* 256 bytes is way over the top, but for safety let's reduce it only @@ -1225,9 +1232,10 @@ key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } #if defined(FEAT_XIM) && defined(HAVE_GTK2) -/*ARGSUSED0*/ static gboolean -key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +key_release_event(GtkWidget *widget UNUSED, + GdkEventKey *event, + gpointer data UNUSED) { /* * GTK+ 2 input methods may do fancy stuff on key release events too. @@ -1243,11 +1251,10 @@ key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * Selection handlers: */ -/*ARGSUSED*/ static gint -selection_clear_event(GtkWidget *widget, +selection_clear_event(GtkWidget *widget UNUSED, GdkEventSelection *event, - gpointer user_data) + gpointer user_data UNUSED) { if (event->selection == clip_plus.gtk_sel_atom) clip_lose_selection(&clip_plus); @@ -1265,12 +1272,11 @@ selection_clear_event(GtkWidget *widget, #define RS_FAIL 2 /* selection_received_cb() called and failed */ static int received_selection = RS_NONE; -/*ARGSUSED*/ static void -selection_received_cb(GtkWidget *widget, +selection_received_cb(GtkWidget *widget UNUSED, GtkSelectionData *data, - guint time_, - gpointer user_data) + guint time_ UNUSED, + gpointer user_data UNUSED) { VimClipboard *cbd; char_u *text; @@ -1414,13 +1420,12 @@ selection_received_cb(GtkWidget *widget, * Prepare our selection data for passing it to the external selection * client. */ -/*ARGSUSED*/ static void -selection_get_cb(GtkWidget *widget, +selection_get_cb(GtkWidget *widget UNUSED, GtkSelectionData *selection_data, guint info, - guint time_, - gpointer user_data) + guint time_ UNUSED, + gpointer user_data UNUSED) { char_u *string; char_u *tmpbuf; @@ -1678,7 +1683,7 @@ process_motion_notify(int x, int y, GdkModifierType state) offshoot = dx > dy ? dx : dy; - /* Make a linearly declaying timer delay with a threshold of 5 at a + /* Make a linearly decaying timer delay with a threshold of 5 at a * distance of 127 pixels from the main window. * * One could think endlessly about the most ergonomic variant here. @@ -1707,9 +1712,8 @@ process_motion_notify(int x, int y, GdkModifierType state) /* * Timer used to recognize multiple clicks of the mouse button. */ -/*ARGSUSED0*/ static gint -motion_repeat_timer_cb(gpointer data) +motion_repeat_timer_cb(gpointer data UNUSED) { int x; int y; @@ -1749,9 +1753,10 @@ motion_repeat_timer_cb(gpointer data) return FALSE; } -/*ARGSUSED2*/ static gint -motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) +motion_notify_event(GtkWidget *widget, + GdkEventMotion *event, + gpointer data UNUSED) { if (event->is_hint) { @@ -1777,9 +1782,10 @@ motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) * by our own timeout mechanism instead of the one provided by GTK+ itself. * This is due to the way the generic VIM code is recognizing multiple clicks. */ -/*ARGSUSED2*/ static gint -button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +button_press_event(GtkWidget *widget, + GdkEventButton *event, + gpointer data UNUSED) { int button; int repeated_click = FALSE; @@ -1855,9 +1861,10 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1. * Instead, it abstracts scrolling via the new GdkEventScroll. */ -/*ARGSUSED2*/ static gboolean -scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) +scroll_event(GtkWidget *widget, + GdkEventScroll *event, + gpointer data UNUSED) { int button; int_u vim_modifiers; @@ -1896,9 +1903,10 @@ scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) #endif /* HAVE_GTK2 */ -/*ARGSUSED*/ static gint -button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +button_release_event(GtkWidget *widget UNUSED, + GdkEventButton *event, + gpointer data UNUSED) { int x, y; int_u vim_modifiers; @@ -2100,7 +2108,6 @@ drag_handle_text(GdkDragContext *context, /* * DND receiver. */ -/*ARGSUSED2*/ static void drag_data_received_cb(GtkWidget *widget, GdkDragContext *context, @@ -2109,7 +2116,7 @@ drag_data_received_cb(GtkWidget *widget, GtkSelectionData *data, guint info, guint time_, - gpointer user_data) + gpointer user_data UNUSED) { GdkModifierType state; @@ -2143,7 +2150,6 @@ drag_data_received_cb(GtkWidget *widget, * be abandoned and pop up a dialog asking the user for confirmation if * necessary. */ -/*ARGSUSED0*/ static void sm_client_check_changed_any(GnomeClient *client, gint key, @@ -2251,7 +2257,6 @@ write_session_file(char_u *filename) * for confirmation if necessary. Save the current editing session and tell * the session manager how to restart Vim. */ -/*ARGSUSED1*/ static gboolean sm_client_save_yourself(GnomeClient *client, gint phase, @@ -2339,7 +2344,6 @@ sm_client_save_yourself(GnomeClient *client, * here since "save_yourself" has been emitted before (unless serious trouble * is happening). */ -/*ARGSUSED0*/ static void sm_client_die(GnomeClient *client, gpointer data) { @@ -2379,10 +2383,9 @@ setup_save_yourself(void) /* * GTK tells us that XSMP needs attention */ -/*ARGSUSED*/ static gboolean local_xsmp_handle_requests(source, condition, data) - GIOChannel *source; + GIOChannel *source UNUSED; GIOCondition condition; gpointer data; { @@ -2480,16 +2483,18 @@ setup_save_yourself(void) * WM_SAVE_YOURSELF hack it actually stores the session... And yes, * it should work with KDE as well. */ -/*ARGSUSED1*/ static GdkFilterReturn -global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data) +global_event_filter(GdkXEvent *xev, + GdkEvent *event UNUSED, + gpointer data UNUSED) { XEvent *xevent = (XEvent *)xev; if (xevent != NULL && xevent->type == ClientMessage && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom) - && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom)) + && (long_u)xevent->xclient.data.l[0] + == GET_X_ATOM(save_yourself_atom)) { out_flush(); ml_sync_all(FALSE, FALSE); /* preserve all swap files */ @@ -2512,7 +2517,6 @@ global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data) /* * GDK handler for X ClientMessage events. */ -/*ARGSUSED2*/ static GdkFilterReturn gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data) { @@ -2558,9 +2562,8 @@ gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data) /* * Setup the window icon & xcmdsrv comm after the main window has been realized. */ -/*ARGSUSED*/ static void -mainwin_realize(GtkWidget *widget, gpointer data) +mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) { /* If you get an error message here, you still need to unpack the runtime * archive! */ @@ -2712,11 +2715,10 @@ create_blank_pointer(void) } #ifdef HAVE_GTK_MULTIHEAD -/*ARGSUSED1*/ static void mainwin_screen_changed_cb(GtkWidget *widget, - GdkScreen *previous_screen, - gpointer data) + GdkScreen *previous_screen UNUSED, + gpointer data UNUSED) { if (!gtk_widget_has_screen(widget)) return; @@ -2757,9 +2759,8 @@ mainwin_screen_changed_cb(GtkWidget *widget, * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the * fact that the main VIM engine doesn't take them into account anywhere. */ -/*ARGSUSED1*/ static void -drawarea_realize_cb(GtkWidget *widget, gpointer data) +drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED) { GtkWidget *sbar; @@ -2789,9 +2790,8 @@ drawarea_realize_cb(GtkWidget *widget, gpointer data) /* * Properly clean up on shutdown. */ -/*ARGSUSED0*/ static void -drawarea_unrealize_cb(GtkWidget *widget, gpointer data) +drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED) { /* Don't write messages to the GUI anymore */ full_screen = FALSE; @@ -2827,11 +2827,10 @@ drawarea_unrealize_cb(GtkWidget *widget, gpointer data) #endif } -/*ARGSUSED0*/ static void -drawarea_style_set_cb(GtkWidget *widget, - GtkStyle *previous_style, - gpointer data) +drawarea_style_set_cb(GtkWidget *widget UNUSED, + GtkStyle *previous_style UNUSED, + gpointer data UNUSED) { gui_mch_new_colors(); } @@ -2840,9 +2839,10 @@ drawarea_style_set_cb(GtkWidget *widget, * Callback routine for the "delete_event" signal on the toplevel window. * Tries to vim gracefully, or refuses to exit with changed buffers. */ -/*ARGSUSED*/ static gint -delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) +delete_event_cb(GtkWidget *widget UNUSED, + GdkEventAny *event UNUSED, + gpointer data UNUSED) { gui_shell_closed(); return TRUE; @@ -2964,7 +2964,7 @@ update_window_manager_hints(int force_width, int force_height) /* At start-up, don't try to set the hints until the initial * values have been used (those that dictate our initial size) - * Let forced (i.e., correct) values thruogh always. + * Let forced (i.e., correct) values through always. */ if (!(force_width && force_height) && init_window_hints_state > 0) { @@ -3142,9 +3142,8 @@ static int clicked_page; /* page clicked in tab line */ /* * Handle selecting an item in the tab line popup menu. */ -/*ARGSUSED*/ static void -tabline_menu_handler(GtkMenuItem *item, gpointer user_data) +tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data) { /* Add the string cmd into input buffer */ send_tabline_menu_event(clicked_page, (int)(long)user_data); @@ -3244,13 +3243,12 @@ on_tabline_menu(GtkWidget *widget, GdkEvent *event) /* * Handle selecting one of the tabs. */ -/*ARGSUSED*/ static void on_select_tab( - GtkNotebook *notebook, - GtkNotebookPage *page, + GtkNotebook *notebook UNUSED, + GtkNotebookPage *page UNUSED, gint idx, - gpointer data) + gpointer data UNUSED) { if (!ignore_tabline_evt) { @@ -3784,7 +3782,7 @@ gui_mch_init(void) #endif if (gtk_socket_id != 0) - /* make sure keybord input can go to the drawarea */ + /* make sure keyboard input can go to the drawarea */ GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS); /* @@ -3922,10 +3920,10 @@ gui_mch_new_colors(void) /* * This signal informs us about the need to rearrange our sub-widgets. */ -/*ARGSUSED*/ static gint -form_configure_event(GtkWidget *widget, GdkEventConfigure *event, - gpointer data) +form_configure_event(GtkWidget *widget UNUSED, + GdkEventConfigure *event, + gpointer data UNUSED) { int usable_height = event->height; @@ -3948,9 +3946,8 @@ form_configure_event(GtkWidget *widget, GdkEventConfigure *event, * We can't do much more here than to trying to preserve what had been done, * since the window is already inevitably going away. */ -/*ARGSUSED0*/ static void -mainwin_destroy_cb(GtkObject *object, gpointer data) +mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED) { /* Don't write messages to the GUI anymore */ full_screen = FALSE; @@ -3980,9 +3977,8 @@ mainwin_destroy_cb(GtkObject *object, gpointer data) * scrollbar init.), actually do the standard hinst and stop the timer. * We'll not let the default hints be set while this timer's active. */ -/*ARGSUSED*/ static gboolean -check_startup_plug_hints(gpointer data) +check_startup_plug_hints(gpointer data UNUSED) { if (init_window_hints_state == 1) { @@ -4055,7 +4051,7 @@ gui_mch_open(void) Columns = w; if (mask & HeightValue) { - if (p_window > h - 1 || !option_was_set((char_u *)"window")) + if (p_window > (long)h - 1 || !option_was_set((char_u *)"window")) p_window = h - 1; Rows = h; } @@ -4229,9 +4225,8 @@ gui_mch_open(void) } -/*ARGSUSED0*/ void -gui_mch_exit(int rc) +gui_mch_exit(int rc UNUSED) { if (gui.mainwin != NULL) gtk_widget_destroy(gui.mainwin); @@ -4286,7 +4281,6 @@ static int resize_idle_installed = FALSE; * report the new size through form_configure_event(). That caused the window * layout to be messed up. */ -/*ARGSUSED0*/ static gboolean force_shell_resize_idle(gpointer data) { @@ -4314,12 +4308,11 @@ force_shell_resize_idle(gpointer data) /* * Set the windows size. */ -/*ARGSUSED2*/ void gui_mch_set_shellsize(int width, int height, - int min_width, int min_height, - int base_width, int base_height, - int direction) + int min_width UNUSED, int min_height UNUSED, + int base_width UNUSED, int base_height UNUSED, + int direction UNUSED) { #ifndef HAVE_GTK2 /* Hack: When the form already is at the desired size, the window might @@ -4413,9 +4406,8 @@ gui_mch_get_screen_dimensions(int *screen_w, int *screen_h) } #if defined(FEAT_TITLE) || defined(PROTO) -/*ARGSUSED*/ void -gui_mch_settitle(char_u *title, char_u *icon) +gui_mch_settitle(char_u *title, char_u *icon UNUSED) { # ifdef HAVE_GTK2 if (title != NULL && output_conv.vc_type != CONV_NONE) @@ -4493,7 +4485,6 @@ gui_mch_show_toolbar(int showit) * Get a font structure for highlighting. * "cbdata" is a pointer to the global gui structure. */ -/*ARGSUSED*/ static void font_sel_ok(GtkWidget *wgt, gpointer cbdata) { @@ -4509,7 +4500,6 @@ font_sel_ok(GtkWidget *wgt, gpointer cbdata) gtk_main_quit(); } -/*ARGSUSED*/ static void font_sel_cancel(GtkWidget *wgt, gpointer cbdata) { @@ -4520,7 +4510,6 @@ font_sel_cancel(GtkWidget *wgt, gpointer cbdata) gtk_main_quit(); } -/*ARGSUSED*/ static void font_sel_destroy(GtkWidget *wgt, gpointer cbdata) { @@ -4620,7 +4609,6 @@ gui_mch_adjust_charheight(void) /* * Try to load the requested fontset. */ -/*ARGSUSED2*/ GuiFontset gui_mch_get_fontset(char_u *name, int report_error, int fixed_width) { @@ -4863,7 +4851,7 @@ get_styled_font_variants(char_u * font_name) styled_font[1] = &gui.ital_font; styled_font[2] = &gui.boldital_font; - /* First free whatever was freviously there. */ + /* First free whatever was previously there. */ for (i = 0; i < 3; ++i) if (*styled_font[i]) { @@ -5012,9 +5000,8 @@ ascii_glyph_table_init(void) * Initialize Vim to use the font or fontset with the given name. * Return FAIL if the font could not be loaded, OK otherwise. */ -/*ARGSUSED1*/ int -gui_mch_init_font(char_u *font_name, int fontset) +gui_mch_init_font(char_u *font_name, int fontset UNUSED) { #ifdef HAVE_GTK2 PangoFontDescription *font_desc; @@ -5326,9 +5313,8 @@ gui_mch_get_font(char_u *name, int report_error) /* * Return the name of font "font" in allocated memory. */ -/*ARGSUSED*/ char_u * -gui_mch_get_fontname(GuiFont font, char_u *name) +gui_mch_get_fontname(GuiFont font, char_u *name UNUSED) { # ifdef HAVE_GTK2 if (font != NOFONT) @@ -5732,7 +5718,7 @@ draw_under(int flags, int row, int col, int cells) { int i; int offset; - const static int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; + static const int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; int y = FILL_Y(row + 1) - 1; /* Undercurl: draw curl at the bottom of the character cell. */ @@ -6402,7 +6388,6 @@ input_timer_cb(gpointer data) /* * Callback function, used when data is available on the SNiFF connection. */ -/* ARGSUSED */ static void sniff_request_cb( gpointer data, @@ -6711,9 +6696,8 @@ clip_mch_request_selection(VimClipboard *cbd) /* * Disown the selection. */ -/*ARGSUSED*/ void -clip_mch_lose_selection(VimClipboard *cbd) +clip_mch_lose_selection(VimClipboard *cbd UNUSED) { /* WEIRD: when using NULL to actually disown the selection, we lose the * selection the first time we own it. */ @@ -6741,9 +6725,8 @@ clip_mch_own_selection(VimClipboard *cbd) * Send the current selection to the clipboard. Do nothing for X because we * will fill in the selection only when requested by another app. */ -/*ARGSUSED*/ void -clip_mch_set_selection(VimClipboard *cbd) +clip_mch_set_selection(VimClipboard *cbd UNUSED) { } @@ -6950,7 +6933,7 @@ mch_set_mouse_shape(int shape) else id &= ~1; /* they are always even (why?) */ } - else if (shape < sizeof(mshape_ids) / sizeof(int)) + else if (shape < (int)(sizeof(mshape_ids) / sizeof(int))) id = mshape_ids[shape]; else return; diff --git a/src/hardcopy.c b/src/hardcopy.c index 7cc256ff..0e7ee4dd 100644 --- a/src/hardcopy.c +++ b/src/hardcopy.c @@ -442,12 +442,11 @@ prt_get_unit(idx) /* * Print the page header. */ -/*ARGSUSED*/ static void prt_header(psettings, pagenum, lnum) prt_settings_T *psettings; int pagenum; - linenr_T lnum; + linenr_T lnum UNUSED; { int width = psettings->chars_per_line; int page_line; @@ -1881,7 +1880,7 @@ prt_next_dsc(p_dsc_line) return FALSE; /* Find type of DSC comment */ - for (comment = 0; comment < NUM_ELEMENTS(prt_dsc_table); comment++) + for (comment = 0; comment < (int)NUM_ELEMENTS(prt_dsc_table); comment++) if (prt_resfile_strncmp(0, prt_dsc_table[comment].string, prt_dsc_table[comment].len) == 0) break; @@ -2454,12 +2453,11 @@ prt_match_charset(p_charset, p_cmap, pp_mbchar) } #endif -/*ARGSUSED*/ int mch_print_init(psettings, jobname, forceit) prt_settings_T *psettings; char_u *jobname; - int forceit; + int forceit UNUSED; { int i; char *paper_name; @@ -2514,7 +2512,7 @@ mch_print_init(psettings, jobname, forceit) if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) { p_mbenc_first = NULL; - for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++) + for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++) if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], &p_mbenc)) { @@ -2642,7 +2640,7 @@ mch_print_init(psettings, jobname, forceit) paper_name = "A4"; paper_strlen = 2; } - for (i = 0; i < PRT_MEDIASIZE_LEN; ++i) + for (i = 0; i < (int)PRT_MEDIASIZE_LEN; ++i) if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen && STRNICMP(prt_mediasize[i].name, paper_name, paper_strlen) == 0) @@ -3308,10 +3306,9 @@ mch_print_end_page() return !prt_file_error; } -/*ARGSUSED*/ int mch_print_begin_page(str) - char_u *str; + char_u *str UNUSED; { int page_num[2]; @@ -3379,11 +3376,10 @@ mch_print_start_line(margin, page_line) #endif } -/*ARGSUSED*/ int mch_print_text_out(p, len) char_u *p; - int len; + int len UNUSED; { int need_break; char_u ch; diff --git a/src/if_cscope.c b/src/if_cscope.c index 1b0a8cda..c11fc2ac 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -83,7 +83,7 @@ static cscmd_T cs_cmds[] = N_("Reinit all connections"), "reset", 0 }, { "show", cs_show, N_("Show connections"), "show", 0 }, - { NULL } + { NULL, NULL, NULL, NULL, 0 } }; static void @@ -107,10 +107,9 @@ static enum * Function given to ExpandGeneric() to obtain the cscope command * expansion. */ -/*ARGSUSED*/ char_u * get_cscope_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { int current_idx; @@ -496,10 +495,9 @@ cs_connection(num, dbpath, ppath) * * MAXPATHL 256 */ -/* ARGSUSED */ static int cs_add(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { char *fname, *ppath, *flags = NULL; @@ -994,7 +992,7 @@ err_closing: vim_free(ppath); #if defined(UNIX) - if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1) + if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1) PERROR(_("cs_create_connection exec failed")); exit(127); @@ -1292,10 +1290,9 @@ cs_find_common(opt, pat, forceit, verbose, use_ll) * * print help */ -/* ARGSUSED */ static int cs_help(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { cscmd_T *cmdp = cs_cmds; @@ -1399,13 +1396,12 @@ GetWin32Error() * * insert a new cscope database filename into the filelist */ -/*ARGSUSED*/ static int cs_insert_filelist(fname, ppath, flags, sb) char *fname; char *ppath; char *flags; - struct stat *sb; + struct stat *sb UNUSED; { short i, j; #ifndef UNIX @@ -1561,10 +1557,9 @@ cs_lookup_cmd(eap) * * nuke em */ -/* ARGSUSED */ static int cs_kill(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { char *stok; short i; @@ -2241,7 +2236,6 @@ cs_read_prompt(i) /* * Used to catch and ignore SIGALRM below. */ -/* ARGSUSED */ static RETSIGTYPE sig_handler SIGDEFARG(sigarg) { @@ -2381,10 +2375,9 @@ cs_release_csp(i, freefnpp) * * calls cs_kill on all cscope connections then reinits */ -/* ARGSUSED */ static int cs_reset(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { char **dblist = NULL, **pplist = NULL, **fllist = NULL; int i; @@ -2497,10 +2490,9 @@ cs_resolve_file(i, name) * * show all cscope connections */ -/* ARGSUSED */ static int cs_show(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { short i; if (cs_cnt_connections() == 0) diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 28bf53de..7f43cab6 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -667,13 +667,11 @@ static void remove_timer(void); static void CALLBACK timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime) # elif defined(FEAT_GUI_GTK) -/*ARGSUSED*/ static gint -timer_proc(gpointer data) +timer_proc(gpointer data UNUSED) # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) -/* ARGSUSED */ static void -timer_proc(XtPointer timed_out, XtIntervalId *interval_id) +timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED) # elif defined(FEAT_GUI_MAC) pascal void timer_proc(EventLoopTimerRef theTimer, void *userData) diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c index ff4a46f6..4b291399 100644 --- a/src/if_xcmdsrv.c +++ b/src/if_xcmdsrv.c @@ -682,7 +682,7 @@ serverGetVimNames(dpy) * Scan all of the names out of the property. */ ga_init2(&ga, 1, 100); - for (p = regProp; (p - regProp) < numItems; p++) + for (p = regProp; (long_u)(p - regProp) < numItems; p++) { entry = p; while (*p != 0 && !isspace(*p)) @@ -969,7 +969,7 @@ LookupName(dpy, name, delete, loose) */ returnValue = (int_u)None; entry = NULL; /* Not needed, but eliminates compiler warning. */ - for (p = regProp; (p - regProp) < numItems; ) + for (p = regProp; (long_u)(p - regProp) < numItems; ) { entry = p; while (*p != 0 && !isspace(*p)) @@ -986,7 +986,7 @@ LookupName(dpy, name, delete, loose) if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name)) { - for (p = regProp; (p - regProp) < numItems; ) + for (p = regProp; (long_u)(p - regProp) < numItems; ) { entry = p; while (*p != 0 && !isspace(*p)) @@ -1056,7 +1056,7 @@ DeleteAnyLingerer(dpy, win) return; /* Scan the property for the window id. */ - for (p = regProp; (p - regProp) < numItems; ) + for (p = regProp; (long_u)(p - regProp) < numItems; ) { if (*p != 0) { @@ -1196,7 +1196,7 @@ serverEventProc(dpy, eventPtr) * one time; each iteration through the outer loop handles a * single command or result. */ - for (p = propInfo; (p - propInfo) < numItems; ) + for (p = propInfo; (long_u)(p - propInfo) < numItems; ) { /* * Ignore leading NULs; each command or result starts with a @@ -1230,7 +1230,7 @@ serverEventProc(dpy, eventPtr) serial = (char_u *)""; script = NULL; enc = NULL; - while (p - propInfo < numItems && *p == '-') + while ((long_u)(p - propInfo) < numItems && *p == '-') { switch (p[1]) { @@ -1333,7 +1333,7 @@ serverEventProc(dpy, eventPtr) res = (char_u *)""; code = 0; enc = NULL; - while ((p-propInfo) < numItems && *p == '-') + while ((long_u)(p - propInfo) < numItems && *p == '-') { switch (p[1]) { @@ -1401,7 +1401,7 @@ serverEventProc(dpy, eventPtr) gotWindow = 0; str = (char_u *)""; enc = NULL; - while ((p-propInfo) < numItems && *p == '-') + while ((long_u)(p - propInfo) < numItems && *p == '-') { switch (p[1]) { @@ -1489,11 +1489,10 @@ AppendPropCarefully(dpy, window, property, value, length) /* * Another X Error handler, just used to check for errors. */ -/* ARGSUSED */ static int x_error_check(dpy, error_event) - Display *dpy; - XErrorEvent *error_event; + Display *dpy UNUSED; + XErrorEvent *error_event UNUSED; { got_x_error = TRUE; return 0; diff --git a/src/macros.h b/src/macros.h index afe3572b..68ea6bcf 100644 --- a/src/macros.h +++ b/src/macros.h @@ -284,7 +284,7 @@ # define mb_cptr2len(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p)) # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++ -# define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : STRLEN(p)) +# define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : (int)STRLEN(p)) # define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : (int)*(p)) #else # define mb_ptr_adv(p) ++p diff --git a/src/main.c b/src/main.c index 9f56e884..c0dd1214 100644 --- a/src/main.c +++ b/src/main.c @@ -1505,10 +1505,9 @@ parse_command_name(parmp) * * Also find the --server... arguments and --socketid and --windowid */ -/*ARGSUSED*/ static void early_arg_scan(parmp) - mparm_T *parmp; + mparm_T *parmp UNUSED; { #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \ || !defined(FEAT_NETBEANS_INTG) @@ -2380,10 +2379,9 @@ read_stdin() * Create the requested number of windows and edit buffers in them. * Also does recovery if "recoverymode" set. */ -/*ARGSUSED*/ static void create_windows(parmp) - mparm_T *parmp; + mparm_T *parmp UNUSED; { #ifdef FEAT_WINDOWS int dorewind; @@ -3851,10 +3849,9 @@ eval_client_expr_to_string(expr) * return an allocated string. Otherwise return "data". * "*tofree" is set to the result when it needs to be freed later. */ -/*ARGSUSED*/ char_u * serverConvert(client_enc, data, tofree) - char_u *client_enc; + char_u *client_enc UNUSED; char_u *data; char_u **tofree; { diff --git a/src/mark.c b/src/mark.c index 03b9f989..ae31cf0f 100644 --- a/src/mark.c +++ b/src/mark.c @@ -884,10 +884,9 @@ ex_delmarks(eap) /* * print the jumplist */ -/*ARGSUSED*/ void ex_jumps(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { int i; char_u *name; @@ -933,10 +932,9 @@ ex_jumps(eap) /* * print the changelist */ -/*ARGSUSED*/ void ex_changes(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { int i; char_u *name; diff --git a/src/mbyte.c b/src/mbyte.c index 42b3063a..1b8733c1 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -1015,10 +1015,9 @@ dbcs_class(lead, trail) * Return length in bytes of character "c". * Returns 1 for a single-byte character. */ -/* ARGSUSED */ int latin_char2len(c) - int c; + int c UNUSED; { return 1; } @@ -1248,10 +1247,9 @@ utf_char2cells(c) * Return the number of display cells character at "*p" occupies. * This doesn't take care of unprintable characters, use ptr2cells() for that. */ -/*ARGSUSED*/ int latin_ptr2cells(p) - char_u *p; + char_u *p UNUSED; { return 1; } @@ -1293,10 +1291,9 @@ dbcs_ptr2cells(p) * Return the number of display cells character "c" occupies. * Only takes care of multi-byte chars, not "^C" and such. */ -/*ARGSUSED*/ int latin_char2cells(c) - int c; + int c UNUSED; { return 1; } @@ -1318,11 +1315,10 @@ dbcs_char2cells(c) * Return number of display cells for char at ScreenLines[off]. * We make sure that the offset used is less than "max_off". */ -/*ARGSUSED*/ int latin_off2cells(off, max_off) - unsigned off; - unsigned max_off; + unsigned off UNUSED; + unsigned max_off UNUSED; { return 1; } @@ -2419,11 +2415,10 @@ show_utf8() * Return offset from "p" to the first byte of the character it points into. * Returns 0 when already at the first byte of a character. */ -/*ARGSUSED*/ int latin_head_off(base, p) - char_u *base; - char_u *p; + char_u *base UNUSED; + char_u *p UNUSED; { return 0; } @@ -3131,7 +3126,7 @@ enc_locale() else s = p + 1; } - for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i) + for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i) { if (s[i] == '_' || s[i] == '-') buf[i] = '-'; @@ -3582,9 +3577,10 @@ im_show_info(void) * Callback invoked when the user finished preediting. * Put the final string into the input buffer. */ -/*ARGSUSED0*/ static void -im_commit_cb(GtkIMContext *context, const gchar *str, gpointer data) +im_commit_cb(GtkIMContext *context UNUSED, + const gchar *str, + gpointer data UNUSED) { int slen = (int)STRLEN(str); int add_to_input = TRUE; @@ -3670,9 +3666,8 @@ im_commit_cb(GtkIMContext *context, const gchar *str, gpointer data) /* * Callback invoked after start to the preedit. */ -/*ARGSUSED*/ static void -im_preedit_start_cb(GtkIMContext *context, gpointer data) +im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) { #ifdef XIM_DEBUG xim_log("im_preedit_start_cb()\n"); @@ -3687,9 +3682,8 @@ im_preedit_start_cb(GtkIMContext *context, gpointer data) /* * Callback invoked after end to the preedit. */ -/*ARGSUSED*/ static void -im_preedit_end_cb(GtkIMContext *context, gpointer data) +im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) { #ifdef XIM_DEBUG xim_log("im_preedit_end_cb()\n"); @@ -3748,9 +3742,8 @@ im_preedit_end_cb(GtkIMContext *context, gpointer data) * remaining input from within the "retrieve_surrounding" signal handler, this * might not be necessary. Gotta ask on vim-dev for opinions. */ -/*ARGSUSED1*/ static void -im_preedit_changed_cb(GtkIMContext *context, gpointer data) +im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED) { char *preedit_string = NULL; int cursor_index = 0; @@ -4616,11 +4609,10 @@ xim_set_focus(focus) } } -/*ARGSUSED*/ void im_set_position(row, col) - int row; - int col; + int row UNUSED; + int col UNUSED; { xim_set_preedit(); } @@ -4927,12 +4919,11 @@ static int xim_real_init __ARGS((Window x11_window, Display *x11_display)); static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer call_data)); static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data)); -/*ARGSUSED*/ static void xim_instantiate_cb(display, client_data, call_data) Display *display; - XPointer client_data; - XPointer call_data; + XPointer client_data UNUSED; + XPointer call_data UNUSED; { Window x11_window; Display *x11_display; @@ -4952,12 +4943,11 @@ xim_instantiate_cb(display, client_data, call_data) xim_instantiate_cb, NULL); } -/*ARGSUSED*/ static void xim_destroy_cb(im, client_data, call_data) - XIM im; - XPointer client_data; - XPointer call_data; + XIM im UNUSED; + XPointer client_data UNUSED; + XPointer call_data UNUSED; { Window x11_window; Display *x11_display; @@ -5276,9 +5266,10 @@ xim_decide_input_style() } } -/*ARGSUSED*/ static void -preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data) +preedit_start_cbproc(XIC thexic UNUSED, + XPointer client_data UNUSED, + XPointer call_data UNUSED) { #ifdef XIM_DEBUG xim_log("xim_decide_input_style()\n"); @@ -5310,9 +5301,10 @@ xim_back_delete(int n) static GSList *key_press_event_queue = NULL; static gboolean processing_queued_event = FALSE; -/*ARGSUSED*/ static void -preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data) +preedit_draw_cbproc(XIC thexic UNUSED, + XPointer client_data UNUSED, + XPointer call_data) { XIMPreeditDrawCallbackStruct *draw_data; XIMText *text; @@ -5451,18 +5443,20 @@ im_get_feedback_attr(int col) return -1; } -/*ARGSUSED*/ static void -preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data) +preedit_caret_cbproc(XIC thexic UNUSED, + XPointer client_data UNUSED, + XPointer call_data UNUSED) { #ifdef XIM_DEBUG xim_log("preedit_caret_cbproc()\n"); #endif } -/*ARGSUSED*/ static void -preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data) +preedit_done_cbproc(XIC thexic UNUSED, + XPointer client_data UNUSED, + XPointer call_data UNUSED) { #ifdef XIM_DEBUG xim_log("preedit_done_cbproc()\n"); @@ -5501,9 +5495,8 @@ xim_reset(void) } } -/*ARGSUSED*/ int -xim_queue_key_press_event(GdkEventKey *event, int down) +xim_queue_key_press_event(GdkEventKey *event, int down UNUSED) { #ifdef XIM_DEBUG xim_log("xim_queue_key_press_event()\n"); @@ -5519,9 +5512,8 @@ xim_queue_key_press_event(GdkEventKey *event, int down) return TRUE; } -/*ARGSUSED*/ static void -preedit_callback_setup(GdkIC *ic) +preedit_callback_setup(GdkIC *ic UNUSED) { XIC xxic; XVaNestedList preedit_attr; @@ -5546,9 +5538,8 @@ preedit_callback_setup(GdkIC *ic) XFree(preedit_attr); } -/*ARGSUSED*/ static void -reset_state_setup(GdkIC *ic) +reset_state_setup(GdkIC *ic UNUSED) { #ifdef USE_X11R6_XIM /* don't change the input context when we call reset */ diff --git a/src/menu.c b/src/menu.c index 7d4839fd..41bebbf3 100644 --- a/src/menu.c +++ b/src/menu.c @@ -231,7 +231,7 @@ ex_menu(eap) if (skipdigits(menu_path + 7) == p) { menuarg.iconidx = atoi((char *)menu_path + 7); - if (menuarg.iconidx >= TOOLBAR_NAME_COUNT) + if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT) menuarg.iconidx = -1; else menuarg.icon_builtin = TRUE; @@ -239,7 +239,7 @@ ex_menu(eap) } else { - for (i = 0; i < TOOLBAR_NAME_COUNT; ++i) + for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i) if (STRNCMP(toolbar_names[i], menu_path, p - menu_path) == 0) { @@ -1341,10 +1341,9 @@ set_context_in_menu_cmd(xp, cmd, arg, forceit) * Function given to ExpandGeneric() to obtain the list of (sub)menus (not * entries). */ -/*ARGSUSED*/ char_u * get_menu_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { static vimmenu_T *menu = NULL; @@ -1378,10 +1377,9 @@ get_menu_name(xp, idx) * Function given to ExpandGeneric() to obtain the list of menus and menu * entries. */ -/*ARGSUSED*/ char_u * get_menu_names(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { static vimmenu_T *menu = NULL; @@ -1739,10 +1737,9 @@ menu_is_hidden(name) /* * Return TRUE if the menu is the tearoff menu. */ -/*ARGSUSED*/ static int menu_is_tearoff(name) - char_u *name; + char_u *name UNUSED; { #ifdef FEAT_GUI return (STRCMP(name, TEAR_STRING) == 0); @@ -2343,10 +2340,9 @@ static garray_T menutrans_ga = {0, 0, 0, 0, NULL}; * This function is also defined without the +multi_lang feature, in which * case the commands are ignored. */ -/*ARGSUSED*/ void ex_menutranslate(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { #ifdef FEAT_MULTI_LANG char_u *arg = eap->arg; diff --git a/src/message.c b/src/message.c index 6e00c1a7..c0f661b0 100644 --- a/src/message.c +++ b/src/message.c @@ -818,10 +818,9 @@ delete_first_msg() /* * ":messages" command. */ -/*ARGSUSED*/ void ex_messages(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { struct msg_hist *p; char_u *s; @@ -3290,15 +3289,15 @@ msg_advance(col) * A '&' in a button name becomes a shortcut, so each '&' should be before a * different letter. */ -/* ARGSUSED */ int do_dialog(type, title, message, buttons, dfltbutton, textfield) - int type; - char_u *title; + int type UNUSED; + char_u *title UNUSED; char_u *message; char_u *buttons; int dfltbutton; - char_u *textfield; /* IObuff for inputdialog(), NULL otherwise */ + char_u *textfield UNUSED; /* IObuff for inputdialog(), NULL + otherwise */ { int oldState; int retval = 0; @@ -4021,7 +4020,7 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) if (*p != '%') { char *q = strchr(p + 1, '%'); - size_t n = (q == NULL) ? STRLEN(p) : (q - p); + size_t n = (q == NULL) ? STRLEN(p) : (size_t)(q - p); /* Copy up to the next '%' or NUL without any changes. */ if (str_l < str_m) @@ -4268,7 +4267,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) precision <= (size_t)0x7fffffffL ? precision : (size_t)0x7fffffffL); #endif - str_arg_l = (q == NULL) ? precision : q - str_arg; + str_arg_l = (q == NULL) ? precision + : (size_t)(q - str_arg); } break; @@ -4368,7 +4368,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) get_a_arg(arg_idx); #else # if defined(FEAT_EVAL) - tvs != NULL ? tv_nr(tvs, &arg_idx) : + tvs != NULL ? (unsigned) + tv_nr(tvs, &arg_idx) : # endif va_arg(ap, unsigned int); #endif @@ -4381,7 +4382,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) get_a_arg(arg_idx); #else # if defined(FEAT_EVAL) - tvs != NULL ? tv_nr(tvs, &arg_idx) : + tvs != NULL ? (unsigned long) + tv_nr(tvs, &arg_idx) : # endif va_arg(ap, unsigned long int); #endif @@ -4704,7 +4706,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) size_t avail = str_m - str_l; vim_memset(str + str_l, zero_padding ? '0' : ' ', - (size_t)pn > avail ? avail : pn); + (size_t)pn > avail ? avail + : (size_t)pn); } str_l += pn; } @@ -4731,7 +4734,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) size_t avail = str_m - str_l; mch_memmove(str + str_l, str_arg, - (size_t)zn > avail ? avail : zn); + (size_t)zn > avail ? avail + : (size_t)zn); } str_l += zn; } @@ -4746,7 +4750,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) size_t avail = str_m-str_l; vim_memset(str + str_l, '0', - (size_t)zn > avail ? avail : zn); + (size_t)zn > avail ? avail + : (size_t)zn); } str_l += zn; } @@ -4765,7 +4770,7 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) mch_memmove(str + str_l, str_arg + zero_padding_insertion_ind, - (size_t)sn > avail ? avail : sn); + (size_t)sn > avail ? avail : (size_t)sn); } str_l += sn; } @@ -4785,7 +4790,8 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) size_t avail = str_m - str_l; vim_memset(str + str_l, ' ', - (size_t)pn > avail ? avail : pn); + (size_t)pn > avail ? avail + : (size_t)pn); } str_l += pn; } diff --git a/src/misc1.c b/src/misc1.c index 47a2274e..2145124d 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -4147,10 +4147,9 @@ vim_setenv(name, val) /* * Function given to ExpandGeneric() to obtain an environment variable name. */ -/*ARGSUSED*/ char_u * get_env_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { # if defined(AMIGA) || defined(__MRC__) || defined(__SC__) @@ -4742,9 +4741,9 @@ find_start_comment(ind_maxcomment) /* XXX */ * If it is then restrict the search to below this line and try again. */ line = ml_get(pos->lnum); - for (p = line; *p && (unsigned)(p - line) < pos->col; ++p) + for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p) p = skip_string(p); - if ((unsigned)(p - line) <= pos->col) + if ((colnr_T)(p - line) <= pos->col) break; cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1; if (cur_maxcomment <= 0) @@ -6275,7 +6274,7 @@ get_c_indent() * check for that. */ if ((State & INSERT) - && curwin->w_cursor.col < STRLEN(linecopy) + && curwin->w_cursor.col < (colnr_T)STRLEN(linecopy) && linecopy[curwin->w_cursor.col] == ')') linecopy[curwin->w_cursor.col] = NUL; diff --git a/src/misc2.c b/src/misc2.c index 9fda8d58..05379931 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -2841,7 +2841,7 @@ get_special_key_code(name) get_key_name(i) int i; { - if (i >= KEY_NAMES_TABLE_LEN) + if (i >= (int)KEY_NAMES_TABLE_LEN) return NULL; return key_names_table[i].name; } @@ -3869,7 +3869,8 @@ typedef struct ff_visited * use filename. */ #ifdef UNIX - int ffv_dev; /* device number (-1 if not set) */ + int ffv_dev_valid; /* ffv_dev and ffv_ino were set */ + dev_t ffv_dev; /* device number */ ino_t ffv_ino; /* inode number */ #endif /* The memory for this struct is allocated according to the length of @@ -4059,13 +4060,12 @@ vim_findnext() * This function silently ignores a few errors, vim_findfile() will have * limited functionality then. */ -/*ARGSUSED*/ void * vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what, search_ctx_arg, tagfile, rel_fname) char_u *path; char_u *filename; - char_u *stopdirs; + char_u *stopdirs UNUSED; int level; int free_visited; int find_what; @@ -5063,10 +5063,9 @@ ff_check_visited(visited_list, fname { if ( #ifdef UNIX - !url - ? (vp->ffv_dev == st.st_dev - && vp->ffv_ino == st.st_ino) - : + !url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev + && vp->ffv_ino == st.st_ino) + : #endif fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0 ) @@ -5091,14 +5090,14 @@ ff_check_visited(visited_list, fname #ifdef UNIX if (!url) { + vp->ffv_dev_valid = TRUE; vp->ffv_ino = st.st_ino; vp->ffv_dev = st.st_dev; vp->ffv_fname[0] = NUL; } else { - vp->ffv_ino = 0; - vp->ffv_dev = -1; + vp->ffv_dev_valid = FALSE; #endif STRCPY(vp->ffv_fname, ff_expand_buffer); #ifdef UNIX diff --git a/src/netbeans.c b/src/netbeans.c index d3a5c595..dba50d45 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -700,7 +700,6 @@ netbeans_parse_messages(void) /* * Read and process a command from netbeans. */ -/*ARGSUSED*/ #if defined(FEAT_GUI_W32) || defined(PROTO) /* Use this one when generating prototypes, the others are static. */ void @@ -708,12 +707,15 @@ messageFromNetbeansW32() #else # ifdef FEAT_GUI_MOTIF static void -messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2) +messageFromNetbeans(XtPointer clientData UNUSED, + int *unused1 UNUSED, + XtInputId *unused2 UNUSED) # endif # ifdef FEAT_GUI_GTK static void -messageFromNetbeans(gpointer clientData, gint unused1, - GdkInputCondition unused2) +messageFromNetbeans(gpointer clientData UNUSED, + gint unused1 UNUSED, + GdkInputCondition unused2 UNUSED) # endif #endif { @@ -1585,7 +1587,9 @@ nb_do_cmd( buf_delsign(buf->bufp, id); } else + { nbdebug((" No sign on line %d\n", i)); + } } nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum)); @@ -2144,7 +2148,9 @@ nb_do_cmd( #endif } else + { nbdebug((" BAD POSITION in setDot: %s\n", s)); + } /* gui_update_cursor(TRUE, FALSE); */ /* update_curbuf(NOT_VALID); */ @@ -2744,11 +2750,10 @@ netbeans_keyname(int key, char *buf) * cursor and sends it to the debugger for evaluation. The debugger should * respond with a showBalloon command when there is a useful result. */ -/*ARGSUSED*/ void netbeans_beval_cb( BalloonEval *beval, - int state) + int state UNUSED) { win_T *wp; char_u *text; @@ -3061,9 +3066,8 @@ netbeans_removed( /* * Send netbeans an unmodufied command. */ -/*ARGSUSED*/ void -netbeans_unmodified(buf_T *bufp) +netbeans_unmodified(buf_T *bufp UNUSED) { #if 0 char_u buf[128]; @@ -3370,13 +3374,12 @@ netbeans_gutter_click(linenr_T lnum) * buf->signmapused[] maps buffer-local annotation IDs to an index in * globalsignmap[]. */ -/*ARGSUSED*/ static void addsigntype( nbbuf_T *buf, int typeNum, char_u *typeName, - char_u *tooltip, + char_u *tooltip UNUSED, char_u *glyphFile, int use_fg, int fg, diff --git a/src/normal.c b/src/normal.c index 9057b780..160beb65 100644 --- a/src/normal.c +++ b/src/normal.c @@ -9243,10 +9243,9 @@ nv_open(cap) } #ifdef FEAT_SNIFF -/*ARGSUSED*/ static void nv_sniff(cap) - cmdarg_T *cap; + cmdarg_T *cap UNUSED; { ProcessSniffRequests(); } @@ -9262,10 +9261,9 @@ nv_nbcmd(cap) #endif #ifdef FEAT_DND -/*ARGSUSED*/ static void nv_drop(cap) - cmdarg_T *cap; + cmdarg_T *cap UNUSED; { do_put('~', BACKWARD, 1L, PUT_CURSEND); } @@ -9277,7 +9275,6 @@ nv_drop(cap) * When waiting for a character for 'updatetime' K_CURSORHOLD is put in the * input buffer. "did_cursorhold" is set to avoid retriggering. */ -/*ARGSUSED*/ static void nv_cursorhold(cap) cmdarg_T *cap; diff --git a/src/option.c b/src/option.c index 1f09a3af..69cdd2b5 100644 --- a/src/option.c +++ b/src/option.c @@ -387,6 +387,9 @@ struct vimoption char_u *def_val[2]; /* default values for variable (vi and vim) */ #ifdef FEAT_EVAL scid_T scriptID; /* script in which the option was last set */ +# define SCRIPTID_INIT , 0 +#else +# define SCRIPTID_INIT #endif }; @@ -477,7 +480,7 @@ static struct vimoption #else (char_u *)224L, #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"antialias", "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, #if defined(FEAT_GUI) && defined(MACOS_X) (char_u *)&p_antialias, PV_NONE, @@ -486,35 +489,35 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)FALSE, (char_u *)FALSE} #endif - }, + SCRIPTID_INIT}, {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_ARABIC (char_u *)VAR_WIN, PV_ARAB, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, #ifdef FEAT_ARABIC (char_u *)&p_arshape, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"allowrevins", "ari", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_RIGHTLEFT (char_u *)&p_ari, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"altkeymap", "akm", P_BOOL|P_VI_DEF, #ifdef FEAT_FKMAP (char_u *)&p_altkeymap, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, #if defined(FEAT_MBYTE) (char_u *)&p_ambw, PV_NONE, @@ -523,27 +526,27 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, #ifdef FEAT_AUTOCHDIR {"autochdir", "acd", P_BOOL|P_VI_DEF, (char_u *)&p_acd, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, #endif {"autoindent", "ai", P_BOOL|P_VI_DEF, (char_u *)&p_ai, PV_AI, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"autoprint", "ap", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"autoread", "ar", P_BOOL|P_VI_DEF, (char_u *)&p_ar, PV_AR, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"autowrite", "aw", P_BOOL|P_VI_DEF, (char_u *)&p_aw, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"autowriteall","awa", P_BOOL|P_VI_DEF, (char_u *)&p_awa, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"background", "bg", P_STRING|P_VI_DEF|P_RCLR, (char_u *)&p_bg, PV_NONE, { @@ -552,13 +555,13 @@ static struct vimoption #else (char_u *)"light", #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP, (char_u *)&p_bs, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_bk, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"backupcopy", "bkc", P_STRING|P_VIM|P_COMMA|P_NODUP, (char_u *)&p_bkc, PV_NONE, #ifdef UNIX @@ -566,10 +569,10 @@ static struct vimoption #else {(char_u *)"auto", (char_u *)"auto"} #endif - }, + SCRIPTID_INIT}, {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, (char_u *)&p_bdir, PV_NONE, - {(char_u *)DFLT_BDIR, (char_u *)0L}}, + {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT}, {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, (char_u *)&p_bex, PV_NONE, { @@ -578,7 +581,7 @@ static struct vimoption #else (char_u *)"~", #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"backupskip", "bsk", P_STRING|P_VI_DEF|P_COMMA, #ifdef FEAT_WILDIGN (char_u *)&p_bsk, PV_NONE, @@ -587,40 +590,40 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, #ifdef FEAT_BEVAL {"balloondelay","bdlay",P_NUM|P_VI_DEF, (char_u *)&p_bdlay, PV_NONE, - {(char_u *)600L, (char_u *)0L}}, + {(char_u *)600L, (char_u *)0L} SCRIPTID_INIT}, {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC, (char_u *)&p_beval, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, # ifdef FEAT_EVAL {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, (char_u *)&p_bexpr, PV_BEXPR, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, # endif #endif {"beautify", "bf", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT, (char_u *)&p_bin, PV_BIN, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"bioskey", "biosk",P_BOOL|P_VI_DEF, #ifdef MSDOS (char_u *)&p_biosk, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"bomb", NULL, P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, #ifdef FEAT_MBYTE (char_u *)&p_bomb, PV_BOMB, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"breakat", "brk", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, #ifdef FEAT_LINEBREAK (char_u *)&p_breakat, PV_NONE, @@ -629,7 +632,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"browsedir", "bsdir",P_STRING|P_VI_DEF, #ifdef FEAT_BROWSE (char_u *)&p_bsdir, PV_NONE, @@ -638,7 +641,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"bufhidden", "bh", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, #if defined(FEAT_QUICKFIX) (char_u *)&p_bh, PV_BH, @@ -647,11 +650,11 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"buflisted", "bl", P_BOOL|P_VI_DEF|P_NOGLOB, (char_u *)&p_bl, PV_BL, {(char_u *)1L, (char_u *)0L} - }, + SCRIPTID_INIT}, {"buftype", "bt", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, #if defined(FEAT_QUICKFIX) (char_u *)&p_bt, PV_BT, @@ -660,7 +663,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"casemap", "cmp", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_MBYTE (char_u *)&p_cmp, PV_NONE, @@ -669,7 +672,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cdpath", "cd", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_SEARCHPATH (char_u *)&p_cdpath, PV_NONE, @@ -678,7 +681,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cedit", NULL, P_STRING, #ifdef FEAT_CMDWIN (char_u *)&p_cedit, PV_NONE, @@ -687,7 +690,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"charconvert", "ccv", P_STRING|P_VI_DEF|P_SECURE, #if defined(FEAT_MBYTE) && defined(FEAT_EVAL) (char_u *)&p_ccv, PV_NONE, @@ -696,14 +699,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CINDENT (char_u *)&p_cin, PV_CIN, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_CINDENT (char_u *)&p_cink, PV_CINK, @@ -712,14 +715,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_CINDENT (char_u *)&p_cino, PV_CINO, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) (char_u *)&p_cinw, PV_CINW, @@ -729,7 +732,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"clipboard", "cb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_CLIPBOARD (char_u *)&p_cb, PV_NONE, @@ -743,20 +746,20 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cmdheight", "ch", P_NUM|P_VI_DEF|P_RALL, (char_u *)&p_ch, PV_NONE, - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"cmdwinheight", "cwh", P_NUM|P_VI_DEF, #ifdef FEAT_CMDWIN (char_u *)&p_cwh, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)7L, (char_u *)0L}}, + {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT}, {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, (char_u *)&Columns, PV_NONE, - {(char_u *)80L, (char_u *)0L}}, + {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT}, {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_COMMENTS (char_u *)&p_com, PV_COM, @@ -766,7 +769,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_FOLDING (char_u *)&p_cms, PV_CMS, @@ -775,12 +778,12 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, /* P_PRI_MKRC isn't needed here, optval_default() * always returns TRUE for 'compatible' */ {"compatible", "cp", P_BOOL|P_RALL, (char_u *)&p_cp, PV_NONE, - {(char_u *)TRUE, (char_u *)FALSE}}, + {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT}, {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_INS_EXPAND (char_u *)&p_cpt, PV_CPT, @@ -789,7 +792,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, #ifdef FEAT_COMPL_FUNC (char_u *)&p_cfu, PV_CFU, @@ -798,7 +801,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"completeopt", "cot", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_INS_EXPAND (char_u *)&p_cot, PV_NONE, @@ -807,34 +810,35 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"confirm", "cf", P_BOOL|P_VI_DEF, #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) (char_u *)&p_confirm, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"conskey", "consk",P_BOOL|P_VI_DEF, #ifdef MSDOS (char_u *)&p_consk, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"copyindent", "ci", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_ci, PV_CI, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"cpoptions", "cpo", P_STRING|P_VIM|P_RALL|P_FLAGLIST, (char_u *)&p_cpo, PV_NONE, - {(char_u *)CPO_VI, (char_u *)CPO_VIM}}, + {(char_u *)CPO_VI, (char_u *)CPO_VIM} + SCRIPTID_INIT}, {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE (char_u *)&p_cspc, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"cscopeprg", "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_CSCOPE (char_u *)&p_csprg, PV_NONE, @@ -843,7 +847,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX) (char_u *)&p_csqf, PV_NONE, @@ -852,45 +856,45 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE (char_u *)&p_cst, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE (char_u *)&p_csto, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE (char_u *)&p_csverbose, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN, #ifdef FEAT_SYN_HL (char_u *)VAR_WIN, PV_CUC, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"cursorline", "cul", P_BOOL|P_VI_DEF|P_RWIN, #ifdef FEAT_SYN_HL (char_u *)VAR_WIN, PV_CUL, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"debug", NULL, P_STRING|P_VI_DEF, (char_u *)&p_debug, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_FIND_ID (char_u *)&p_def, PV_DEF, @@ -899,28 +903,28 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"delcombine", "deco", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_MBYTE (char_u *)&p_deco, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_INS_EXPAND (char_u *)&p_dict, PV_DICT, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"diff", NULL, P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB, #ifdef FEAT_DIFF (char_u *)VAR_WIN, PV_DIFF, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"diffexpr", "dex", P_STRING|P_VI_DEF|P_SECURE, #if defined(FEAT_DIFF) && defined(FEAT_EVAL) (char_u *)&p_dex, PV_NONE, @@ -929,7 +933,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP, #ifdef FEAT_DIFF (char_u *)&p_dip, PV_NONE, @@ -938,20 +942,20 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)NULL} #endif - }, + SCRIPTID_INIT}, {"digraph", "dg", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_DIGRAPHS (char_u *)&p_dg, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, (char_u *)&p_dir, PV_NONE, - {(char_u *)DFLT_DIR, (char_u *)0L}}, + {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT}, {"display", "dy", P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP, (char_u *)&p_dy, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"eadirection", "ead", P_STRING|P_VI_DEF, #ifdef FEAT_VERTSPLIT (char_u *)&p_ead, PV_NONE, @@ -960,10 +964,10 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"edcompatible","ed", P_BOOL|P_VI_DEF, (char_u *)&p_ed, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"encoding", "enc", P_STRING|P_VI_DEF|P_RCLR, #ifdef FEAT_MBYTE (char_u *)&p_enc, PV_NONE, @@ -972,19 +976,19 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"endofline", "eol", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, (char_u *)&p_eol, PV_EOL, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"equalalways", "ea", P_BOOL|P_VI_DEF|P_RALL, (char_u *)&p_ea, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"equalprg", "ep", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_ep, PV_EP, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"errorbells", "eb", P_BOOL|P_VI_DEF, (char_u *)&p_eb, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"errorfile", "ef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_QUICKFIX (char_u *)&p_ef, PV_NONE, @@ -993,32 +997,32 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"errorformat", "efm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_QUICKFIX (char_u *)&p_efm, PV_EFM, - {(char_u *)DFLT_EFM, (char_u *)0L}, + {(char_u *)DFLT_EFM, (char_u *)0L} #else (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"esckeys", "ek", P_BOOL|P_VIM, (char_u *)&p_ek, PV_NONE, - {(char_u *)FALSE, (char_u *)TRUE}}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"eventignore", "ei", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_AUTOCMD (char_u *)&p_ei, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"expandtab", "et", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_et, PV_ET, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE, (char_u *)&p_exrc, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC, #ifdef FEAT_MBYTE (char_u *)&p_fenc, PV_FENC, @@ -1027,7 +1031,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA, #ifdef FEAT_MBYTE (char_u *)&p_fencs, PV_NONE, @@ -1036,13 +1040,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC, (char_u *)&p_ff, PV_FF, - {(char_u *)DFLT_FF, (char_u *)0L}}, + {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT}, {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP, (char_u *)&p_ffs, PV_NONE, - {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}}, + {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM} + SCRIPTID_INIT}, {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, #ifdef FEAT_AUTOCMD (char_u *)&p_ft, PV_FT, @@ -1051,7 +1056,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING) (char_u *)&p_fcs, PV_NONE, @@ -1060,27 +1065,27 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"fkmap", "fk", P_BOOL|P_VI_DEF, #ifdef FEAT_FKMAP (char_u *)&p_fkmap, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"flash", "fl", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, #ifdef FEAT_FOLDING {"foldclose", "fcl", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN, (char_u *)&p_fcl, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FDC, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"foldenable", "fen", P_BOOL|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FEN, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"foldexpr", "fde", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, # ifdef FEAT_EVAL (char_u *)VAR_WIN, PV_FDE, @@ -1089,33 +1094,34 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} # endif - }, + SCRIPTID_INIT}, {"foldignore", "fdi", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FDI, - {(char_u *)"#", (char_u *)NULL}}, + {(char_u *)"#", (char_u *)NULL} SCRIPTID_INIT}, {"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FDL, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"foldlevelstart","fdls", P_NUM|P_VI_DEF, (char_u *)&p_fdls, PV_NONE, - {(char_u *)-1L, (char_u *)0L}}, + {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT}, {"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF| P_RWIN|P_COMMA|P_NODUP, (char_u *)VAR_WIN, PV_FMR, - {(char_u *)"{{{,}}}", (char_u *)NULL}}, + {(char_u *)"{{{,}}}", (char_u *)NULL} + SCRIPTID_INIT}, {"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FDM, - {(char_u *)"manual", (char_u *)NULL}}, + {(char_u *)"manual", (char_u *)NULL} SCRIPTID_INIT}, {"foldminlines","fml", P_NUM|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FML, - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_FDN, - {(char_u *)20L, (char_u *)0L}}, + {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, {"foldopen", "fdo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_fdo, PV_NONE, {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo", - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, # ifdef FEAT_EVAL (char_u *)VAR_WIN, PV_FDT, @@ -1124,7 +1130,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} # endif - }, + SCRIPTID_INIT}, #endif {"formatexpr", "fex", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, #ifdef FEAT_EVAL @@ -1134,16 +1140,18 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"formatoptions","fo", P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST, (char_u *)&p_fo, PV_FO, - {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM}}, + {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM} + SCRIPTID_INIT}, {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF, (char_u *)&p_flp, PV_FLP, - {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", (char_u *)0L}}, + {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", + (char_u *)0L} SCRIPTID_INIT}, {"formatprg", "fp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_fp, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"fsync", "fs", P_BOOL|P_SECURE|P_VI_DEF, #ifdef HAVE_FSYNC (char_u *)&p_fs, PV_NONE, @@ -1152,22 +1160,22 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)FALSE, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"gdefault", "gd", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_gd, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"graphic", "gr", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"grepformat", "gfm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_QUICKFIX (char_u *)&p_gefm, PV_NONE, - {(char_u *)DFLT_GREPFORMAT, (char_u *)0L}, + {(char_u *)DFLT_GREPFORMAT, (char_u *)0L} #else (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"grepprg", "gp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_QUICKFIX (char_u *)&p_gp, PV_GP, @@ -1185,15 +1193,15 @@ static struct vimoption (char_u *)"SEARCH/NUMBERS ", # else (char_u *)"grep -n ", -#endif -#endif +# endif +# endif # endif - (char_u *)0L}, + (char_u *)0L} #else (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guicursor", "gcr", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef CURSOR_SHAPE (char_u *)&p_guicursor, PV_NONE, @@ -1208,7 +1216,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, #ifdef FEAT_GUI (char_u *)&p_guifont, PV_NONE, @@ -1217,7 +1225,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_COMMA, #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) (char_u *)&p_guifontset, PV_NONE, @@ -1226,7 +1234,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, #if defined(FEAT_GUI) && defined(FEAT_MBYTE) (char_u *)&p_guifontwide, PV_NONE, @@ -1235,14 +1243,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guiheadroom", "ghr", P_NUM|P_VI_DEF, #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) (char_u *)&p_ghr, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)50L, (char_u *)0L}}, + {(char_u *)50L, (char_u *)0L} SCRIPTID_INIT}, {"guioptions", "go", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, #if defined(FEAT_GUI) (char_u *)&p_go, PV_NONE, @@ -1255,14 +1263,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guipty", NULL, P_BOOL|P_VI_DEF, #if defined(FEAT_GUI) (char_u *)&p_guipty, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"guitablabel", "gtl", P_STRING|P_VI_DEF|P_RWIN, #if defined(FEAT_GUI_TABLINE) (char_u *)&p_gtl, PV_NONE, @@ -1271,7 +1279,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"guitabtooltip", "gtt", P_STRING|P_VI_DEF|P_RWIN, #if defined(FEAT_GUI_TABLINE) (char_u *)&p_gtt, PV_NONE, @@ -1280,20 +1288,21 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"hardtabs", "ht", P_NUM|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"helpfile", "hf", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_hf, PV_NONE, - {(char_u *)DFLT_HELPFILE, (char_u *)0L}}, + {(char_u *)DFLT_HELPFILE, (char_u *)0L} + SCRIPTID_INIT}, {"helpheight", "hh", P_NUM|P_VI_DEF, #ifdef FEAT_WINDOWS (char_u *)&p_hh, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)20L, (char_u *)0L}}, + {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, {"helplang", "hlg", P_STRING|P_VI_DEF|P_COMMA, #ifdef FEAT_MULTI_LANG (char_u *)&p_hlg, PV_NONE, @@ -1302,64 +1311,65 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"hidden", "hid", P_BOOL|P_VI_DEF, (char_u *)&p_hid, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, (char_u *)&p_hl, PV_NONE, - {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}}, + {(char_u *)HIGHLIGHT_INIT, (char_u *)0L} + SCRIPTID_INIT}, {"history", "hi", P_NUM|P_VIM, (char_u *)&p_hi, PV_NONE, - {(char_u *)0L, (char_u *)20L}}, + {(char_u *)0L, (char_u *)20L} SCRIPTID_INIT}, {"hkmap", "hk", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_RIGHTLEFT (char_u *)&p_hkmap, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"hkmapp", "hkp", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_RIGHTLEFT (char_u *)&p_hkmapp, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"hlsearch", "hls", P_BOOL|P_VI_DEF|P_VIM|P_RALL, (char_u *)&p_hls, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"icon", NULL, P_BOOL|P_VI_DEF, #ifdef FEAT_TITLE (char_u *)&p_icon, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"iconstring", NULL, P_STRING|P_VI_DEF, #ifdef FEAT_TITLE (char_u *)&p_iconstring, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"ignorecase", "ic", P_BOOL|P_VI_DEF, (char_u *)&p_ic, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"imactivatekey","imak",P_STRING|P_VI_DEF, #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) (char_u *)&p_imak, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"imcmdline", "imc", P_BOOL|P_VI_DEF, #ifdef USE_IM_CONTROL (char_u *)&p_imcmdline, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"imdisable", "imd", P_BOOL|P_VI_DEF, #ifdef USE_IM_CONTROL (char_u *)&p_imdisable, PV_NONE, @@ -1371,7 +1381,7 @@ static struct vimoption #else {(char_u *)FALSE, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"iminsert", "imi", P_NUM|P_VI_DEF, (char_u *)&p_iminsert, PV_IMI, #ifdef B_IMODE_IM @@ -1379,7 +1389,7 @@ static struct vimoption #else {(char_u *)B_IMODE_NONE, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"imsearch", "ims", P_NUM|P_VI_DEF, (char_u *)&p_imsearch, PV_IMS, #ifdef B_IMODE_IM @@ -1387,7 +1397,7 @@ static struct vimoption #else {(char_u *)B_IMODE_NONE, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_FIND_ID (char_u *)&p_inc, PV_INC, @@ -1396,7 +1406,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF, #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) (char_u *)&p_inex, PV_INEX, @@ -1405,10 +1415,10 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"incsearch", "is", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_is, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) (char_u *)&p_inde, PV_INDE, @@ -1417,7 +1427,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) (char_u *)&p_indk, PV_INDK, @@ -1426,13 +1436,13 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"infercase", "inf", P_BOOL|P_VI_DEF, (char_u *)&p_inf, PV_INF, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"insertmode", "im", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_im, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"isfname", "isf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_isf, PV_NONE, { @@ -1455,7 +1465,7 @@ static struct vimoption # endif # endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"isident", "isi", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_isi, PV_NONE, { @@ -1472,7 +1482,7 @@ static struct vimoption (char_u *)"@,48-57,_,192-255", # endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"iskeyword", "isk", P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP, (char_u *)&p_isk, PV_ISK, { @@ -1491,7 +1501,7 @@ static struct vimoption ISK_LATIN1 # endif #endif - }}, + } SCRIPTID_INIT}, {"isprint", "isp", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, (char_u *)&p_isp, PV_NONE, { @@ -1507,10 +1517,10 @@ static struct vimoption ISP_LATIN1, # endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"joinspaces", "js", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_js, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"key", NULL, P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC, #ifdef FEAT_CRYPT (char_u *)&p_key, PV_KEY, @@ -1519,7 +1529,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC, #ifdef FEAT_KEYMAP (char_u *)&p_keymap, PV_KMAP, @@ -1528,14 +1538,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"keymodel", "km", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_VISUAL (char_u *)&p_km, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_kp, PV_KP, { @@ -1556,7 +1566,7 @@ static struct vimoption # endif #endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"langmap", "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_LANGMAP (char_u *)&p_langmap, PV_NONE, @@ -1565,31 +1575,31 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME, #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) (char_u *)&p_lm, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL, #ifdef FEAT_WINDOWS (char_u *)&p_ls, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"lazyredraw", "lz", P_BOOL|P_VI_DEF, (char_u *)&p_lz, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"linebreak", "lbr", P_BOOL|P_VI_DEF|P_RWIN, #ifdef FEAT_LINEBREAK (char_u *)VAR_WIN, PV_LBR, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"lines", NULL, P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, (char_u *)&Rows, PV_NONE, { @@ -1598,7 +1608,7 @@ static struct vimoption #else (char_u *)24L, #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"linespace", "lsp", P_NUM|P_VI_DEF|P_RCLR, #ifdef FEAT_GUI (char_u *)&p_linespace, PV_NONE, @@ -1610,14 +1620,14 @@ static struct vimoption #else {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"lisp", NULL, P_BOOL|P_VI_DEF, #ifdef FEAT_LISP (char_u *)&p_lisp, PV_LISP, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"lispwords", "lw", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_LISP (char_u *)&p_lispwords, PV_NONE, @@ -1626,24 +1636,24 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_LIST, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, (char_u *)&p_lcs, PV_NONE, - {(char_u *)"eol:$", (char_u *)0L}}, + {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT}, {"loadplugins", "lpl", P_BOOL|P_VI_DEF, (char_u *)&p_lpl, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, #ifdef FEAT_GUI_MAC {"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR, (char_u *)&p_macatsui, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, #endif {"magic", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_magic, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"makeef", "mef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_QUICKFIX (char_u *)&p_mef, PV_NONE, @@ -1652,7 +1662,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"makeprg", "mp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_QUICKFIX (char_u *)&p_mp, PV_MP, @@ -1665,49 +1675,52 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_mps, PV_MPS, - {(char_u *)"(:),{:},[:]", (char_u *)0L}}, + {(char_u *)"(:),{:},[:]", (char_u *)0L} + SCRIPTID_INIT}, {"matchtime", "mat", P_NUM|P_VI_DEF, (char_u *)&p_mat, PV_NONE, - {(char_u *)5L, (char_u *)0L}}, + {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT}, {"maxcombine", "mco", P_NUM|P_VI_DEF, #ifdef FEAT_MBYTE (char_u *)&p_mco, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)2, (char_u *)0L}}, + {(char_u *)2, (char_u *)0L} SCRIPTID_INIT}, {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF, #ifdef FEAT_EVAL (char_u *)&p_mfd, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)100L, (char_u *)0L}}, + {(char_u *)100L, (char_u *)0L} SCRIPTID_INIT}, {"maxmapdepth", "mmd", P_NUM|P_VI_DEF, (char_u *)&p_mmd, PV_NONE, - {(char_u *)1000L, (char_u *)0L}}, + {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, {"maxmem", "mm", P_NUM|P_VI_DEF, (char_u *)&p_mm, PV_NONE, - {(char_u *)DFLT_MAXMEM, (char_u *)0L}}, + {(char_u *)DFLT_MAXMEM, (char_u *)0L} + SCRIPTID_INIT}, {"maxmempattern","mmp", P_NUM|P_VI_DEF, (char_u *)&p_mmp, PV_NONE, - {(char_u *)1000L, (char_u *)0L}}, + {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, {"maxmemtot", "mmt", P_NUM|P_VI_DEF, (char_u *)&p_mmt, PV_NONE, - {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L}}, + {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L} + SCRIPTID_INIT}, {"menuitems", "mis", P_NUM|P_VI_DEF, #ifdef FEAT_MENU (char_u *)&p_mis, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)25L, (char_u *)0L}}, + {(char_u *)25L, (char_u *)0L} SCRIPTID_INIT}, {"mesg", NULL, P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"mkspellmem", "msm", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE, #ifdef FEAT_SPELL (char_u *)&p_msm, PV_NONE, @@ -1716,22 +1729,22 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"modeline", "ml", P_BOOL|P_VIM, (char_u *)&p_ml, PV_ML, - {(char_u *)FALSE, (char_u *)TRUE}}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"modelines", "mls", P_NUM|P_VI_DEF, (char_u *)&p_mls, PV_NONE, - {(char_u *)5L, (char_u *)0L}}, + {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT}, {"modifiable", "ma", P_BOOL|P_VI_DEF|P_NOGLOB, (char_u *)&p_ma, PV_MA, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"modified", "mod", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, (char_u *)&p_mod, PV_MOD, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"more", NULL, P_BOOL|P_VIM, (char_u *)&p_more, PV_NONE, - {(char_u *)FALSE, (char_u *)TRUE}}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"mouse", NULL, P_STRING|P_VI_DEF|P_FLAGLIST, (char_u *)&p_mouse, PV_NONE, { @@ -1740,21 +1753,21 @@ static struct vimoption #else (char_u *)"", #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"mousefocus", "mousef", P_BOOL|P_VI_DEF, #ifdef FEAT_GUI (char_u *)&p_mousef, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"mousehide", "mh", P_BOOL|P_VI_DEF, #ifdef FEAT_GUI (char_u *)&p_mh, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"mousemodel", "mousem", P_STRING|P_VI_DEF, (char_u *)&p_mousem, PV_NONE, { @@ -1767,7 +1780,7 @@ static struct vimoption (char_u *)"extend", # endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_MOUSESHAPE (char_u *)&p_mouseshape, PV_NONE, @@ -1776,33 +1789,34 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"mousetime", "mouset", P_NUM|P_VI_DEF, (char_u *)&p_mouset, PV_NONE, - {(char_u *)500L, (char_u *)0L}}, + {(char_u *)500L, (char_u *)0L} SCRIPTID_INIT}, {"mzquantum", "mzq", P_NUM, #ifdef FEAT_MZSCHEME (char_u *)&p_mzq, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)100L, (char_u *)100L}}, + {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT}, {"novice", NULL, P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_nf, PV_NF, - {(char_u *)"octal,hex", (char_u *)0L}}, + {(char_u *)"octal,hex", (char_u *)0L} + SCRIPTID_INIT}, {"number", "nu", P_BOOL|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_NU, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"numberwidth", "nuw", P_NUM|P_RWIN|P_VIM, #ifdef FEAT_LINEBREAK (char_u *)VAR_WIN, PV_NUW, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)8L, (char_u *)4L}}, + {(char_u *)8L, (char_u *)4L} SCRIPTID_INIT}, {"omnifunc", "ofu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, #ifdef FEAT_COMPL_FUNC (char_u *)&p_ofu, PV_OFU, @@ -1811,10 +1825,10 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"open", NULL, P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"opendevice", "odev", P_BOOL|P_VI_DEF, #if defined(MSDOS) || defined(MSWIN) || defined(OS2) (char_u *)&p_odev, PV_NONE, @@ -1822,13 +1836,13 @@ static struct vimoption (char_u *)NULL, PV_NONE, #endif {(char_u *)FALSE, (char_u *)FALSE} - }, + SCRIPTID_INIT}, {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_opfunc, PV_NONE, - {(char_u *)"", (char_u *)0L} }, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"optimize", "opt", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_OSFILETYPE (char_u *)&p_oft, PV_OFT, @@ -1837,17 +1851,17 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"paragraphs", "para", P_STRING|P_VI_DEF, (char_u *)&p_para, PV_NONE, {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"paste", NULL, P_BOOL|P_VI_DEF|P_PRI_MKRC, (char_u *)&p_paste, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"pastetoggle", "pt", P_STRING|P_VI_DEF, (char_u *)&p_pt, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"patchexpr", "pex", P_STRING|P_VI_DEF|P_SECURE, #if defined(FEAT_DIFF) && defined(FEAT_EVAL) (char_u *)&p_pex, PV_NONE, @@ -1856,10 +1870,10 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"patchmode", "pm", P_STRING|P_VI_DEF|P_NFNAME, (char_u *)&p_pm, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_path, PV_PATH, { @@ -1872,24 +1886,24 @@ static struct vimoption (char_u *)".,/usr/include,,", # endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_pi, PV_PI, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"previewheight", "pvh", P_NUM|P_VI_DEF, #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) (char_u *)&p_pvh, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)12L, (char_u *)0L}}, + {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT}, {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) (char_u *)VAR_WIN, PV_PVW, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE, #ifdef FEAT_PRINTER (char_u *)&p_pdev, PV_NONE, @@ -1898,7 +1912,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printencoding", "penc", P_STRING|P_VI_DEF, #ifdef FEAT_POSTSCRIPT (char_u *)&p_penc, PV_NONE, @@ -1907,7 +1921,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printexpr", "pexpr", P_STRING|P_VI_DEF, #ifdef FEAT_POSTSCRIPT (char_u *)&p_pexpr, PV_NONE, @@ -1916,7 +1930,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printfont", "pfn", P_STRING|P_VI_DEF, #ifdef FEAT_PRINTER (char_u *)&p_pfn, PV_NONE, @@ -1931,7 +1945,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printheader", "pheader", P_STRING|P_VI_DEF|P_GETTEXT, #ifdef FEAT_PRINTER (char_u *)&p_header, PV_NONE, @@ -1940,7 +1954,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printmbcharset", "pmbcs", P_STRING|P_VI_DEF, #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) (char_u *)&p_pmcs, PV_NONE, @@ -1949,7 +1963,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printmbfont", "pmbfn", P_STRING|P_VI_DEF, #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) (char_u *)&p_pmfn, PV_NONE, @@ -1958,7 +1972,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_PRINTER (char_u *)&p_popt, PV_NONE, @@ -1967,17 +1981,17 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"prompt", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_prompt, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"pumheight", "ph", P_NUM|P_VI_DEF, #ifdef FEAT_INS_EXPAND (char_u *)&p_ph, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_TEXTOBJ (char_u *)&p_qe, PV_QE, @@ -1986,47 +2000,47 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"readonly", "ro", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, (char_u *)&p_ro, PV_RO, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"redraw", NULL, P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"redrawtime", "rdt", P_NUM|P_VI_DEF, #ifdef FEAT_RELTIME (char_u *)&p_rdt, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)2000L, (char_u *)0L}}, + {(char_u *)2000L, (char_u *)0L} SCRIPTID_INIT}, {"remap", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_remap, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"report", NULL, P_NUM|P_VI_DEF, (char_u *)&p_report, PV_NONE, - {(char_u *)2L, (char_u *)0L}}, + {(char_u *)2L, (char_u *)0L} SCRIPTID_INIT}, {"restorescreen", "rs", P_BOOL|P_VI_DEF, #ifdef WIN3264 (char_u *)&p_rs, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"revins", "ri", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_RIGHTLEFT (char_u *)&p_ri, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"rightleft", "rl", P_BOOL|P_VI_DEF|P_RWIN, #ifdef FEAT_RIGHTLEFT (char_u *)VAR_WIN, PV_RL, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN, #ifdef FEAT_RIGHTLEFT (char_u *)VAR_WIN, PV_RLC, @@ -2035,40 +2049,41 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT, #ifdef FEAT_CMDL_INFO (char_u *)&p_ru, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"rulerformat", "ruf", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, #ifdef FEAT_STL_OPT (char_u *)&p_ruf, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE, (char_u *)&p_rtp, PV_NONE, - {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}}, + {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} + SCRIPTID_INIT}, {"scroll", "scr", P_NUM|P_NO_MKRC|P_VI_DEF, (char_u *)VAR_WIN, PV_SCROLL, - {(char_u *)12L, (char_u *)0L}}, + {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT}, {"scrollbind", "scb", P_BOOL|P_VI_DEF, #ifdef FEAT_SCROLLBIND (char_u *)VAR_WIN, PV_SCBIND, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"scrolljump", "sj", P_NUM|P_VI_DEF|P_VIM, (char_u *)&p_sj, PV_NONE, - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL, (char_u *)&p_so, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_SCROLLBIND (char_u *)&p_sbo, PV_NONE, @@ -2077,27 +2092,29 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"sections", "sect", P_STRING|P_VI_DEF, (char_u *)&p_sections, PV_NONE, - {(char_u *)"SHNHH HUnhsh", (char_u *)0L}}, + {(char_u *)"SHNHH HUnhsh", (char_u *)0L} + SCRIPTID_INIT}, {"secure", NULL, P_BOOL|P_VI_DEF|P_SECURE, (char_u *)&p_secure, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"selection", "sel", P_STRING|P_VI_DEF, #ifdef FEAT_VISUAL (char_u *)&p_sel, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"inclusive", (char_u *)0L}}, + {(char_u *)"inclusive", (char_u *)0L} + SCRIPTID_INIT}, {"selectmode", "slm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_VISUAL (char_u *)&p_slm, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_SESSION (char_u *)&p_ssop, PV_NONE, @@ -2107,7 +2124,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"shell", "sh", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_sh, PV_NONE, { @@ -2136,7 +2153,7 @@ static struct vimoption # endif # endif #endif /* VMS */ - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_shcf, PV_NONE, { @@ -2149,7 +2166,7 @@ static struct vimoption (char_u *)"-c", # endif #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"shellpipe", "sp", P_STRING|P_VI_DEF|P_SECURE, #ifdef FEAT_QUICKFIX (char_u *)&p_sp, PV_NONE, @@ -2168,30 +2185,30 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"shellquote", "shq", P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_shq, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"shellredir", "srr", P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_srr, PV_NONE, - {(char_u *)">", (char_u *)0L}}, + {(char_u *)">", (char_u *)0L} SCRIPTID_INIT}, {"shellslash", "ssl", P_BOOL|P_VI_DEF, #ifdef BACKSLASH_IN_FILENAME (char_u *)&p_ssl, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"shelltemp", "stmp", P_BOOL, (char_u *)&p_stmp, PV_NONE, - {(char_u *)FALSE, (char_u *)TRUE}}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"shelltype", "st", P_NUM|P_VI_DEF, #ifdef AMIGA (char_u *)&p_st, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_sxq, PV_NONE, { @@ -2200,30 +2217,31 @@ static struct vimoption #else (char_u *)"", #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"shiftround", "sr", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_sr, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"shiftwidth", "sw", P_NUM|P_VI_DEF, (char_u *)&p_sw, PV_SW, - {(char_u *)8L, (char_u *)0L}}, + {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT}, {"shortmess", "shm", P_STRING|P_VIM|P_FLAGLIST, (char_u *)&p_shm, PV_NONE, - {(char_u *)"", (char_u *)"filnxtToO"}}, + {(char_u *)"", (char_u *)"filnxtToO"} + SCRIPTID_INIT}, {"shortname", "sn", P_BOOL|P_VI_DEF, #ifdef SHORT_FNAME (char_u *)NULL, PV_NONE, #else (char_u *)&p_sn, PV_SN, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"showbreak", "sbr", P_STRING|P_VI_DEF|P_RALL, #ifdef FEAT_LINEBREAK (char_u *)&p_sbr, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"showcmd", "sc", P_BOOL|P_VIM, #ifdef FEAT_CMDL_INFO (char_u *)&p_sc, PV_NONE, @@ -2236,58 +2254,58 @@ static struct vimoption #else (char_u *)TRUE #endif - }}, + } SCRIPTID_INIT}, {"showfulltag", "sft", P_BOOL|P_VI_DEF, (char_u *)&p_sft, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"showmatch", "sm", P_BOOL|P_VI_DEF, (char_u *)&p_sm, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"showmode", "smd", P_BOOL|P_VIM, (char_u *)&p_smd, PV_NONE, - {(char_u *)FALSE, (char_u *)TRUE}}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL, #ifdef FEAT_WINDOWS (char_u *)&p_stal, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"sidescroll", "ss", P_NUM|P_VI_DEF, (char_u *)&p_ss, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF, (char_u *)&p_siso, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"slowopen", "slow", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"smartcase", "scs", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_scs, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"smartindent", "si", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_SMARTINDENT (char_u *)&p_si, PV_SI, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_sta, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"softtabstop", "sts", P_NUM|P_VI_DEF|P_VIM, (char_u *)&p_sts, PV_STS, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"sourceany", NULL, P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"spell", NULL, P_BOOL|P_VI_DEF|P_RWIN, #ifdef FEAT_SPELL (char_u *)VAR_WIN, PV_SPELL, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF, #ifdef FEAT_SPELL (char_u *)&p_spc, PV_SPC, @@ -2296,7 +2314,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA, #ifdef FEAT_SPELL (char_u *)&p_spf, PV_SPF, @@ -2305,7 +2323,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND, #ifdef FEAT_SPELL (char_u *)&p_spl, PV_SPL, @@ -2314,7 +2332,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA, #ifdef FEAT_SPELL (char_u *)&p_sps, PV_NONE, @@ -2323,35 +2341,35 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"splitbelow", "sb", P_BOOL|P_VI_DEF, #ifdef FEAT_WINDOWS (char_u *)&p_sb, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"splitright", "spr", P_BOOL|P_VI_DEF, #ifdef FEAT_VERTSPLIT (char_u *)&p_spr, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"startofline", "sol", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_sol, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"statusline" ,"stl", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, #ifdef FEAT_STL_OPT (char_u *)&p_stl, PV_STL, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"suffixes", "su", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_su, PV_NONE, {(char_u *)".bak,~,.o,.h,.info,.swp,.obj", - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP, #ifdef FEAT_SEARCHPATH (char_u *)&p_sua, PV_SUA, @@ -2360,16 +2378,16 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"swapfile", "swf", P_BOOL|P_VI_DEF|P_RSTAT, (char_u *)&p_swf, PV_SWF, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"swapsync", "sws", P_STRING|P_VI_DEF, (char_u *)&p_sws, PV_NONE, - {(char_u *)"fsync", (char_u *)0L}}, + {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT}, {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_swb, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF, #ifdef FEAT_SYN_HL (char_u *)&p_smc, PV_SMC, @@ -2378,7 +2396,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, #ifdef FEAT_SYN_HL (char_u *)&p_syn, PV_SYN, @@ -2387,24 +2405,24 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"tabline", "tal", P_STRING|P_VI_DEF|P_RALL, #ifdef FEAT_STL_OPT (char_u *)&p_tal, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"tabpagemax", "tpm", P_NUM|P_VI_DEF, #ifdef FEAT_WINDOWS (char_u *)&p_tpm, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)10L, (char_u *)0L}}, + {(char_u *)10L, (char_u *)0L} SCRIPTID_INIT}, {"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF, (char_u *)&p_ts, PV_TS, - {(char_u *)8L, (char_u *)0L}}, + {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT}, {"tagbsearch", "tbs", P_BOOL|P_VI_DEF, (char_u *)&p_tbs, PV_NONE, #ifdef VMS /* binary searching doesn't appear to work on VMS */ @@ -2412,13 +2430,13 @@ static struct vimoption #else {(char_u *)TRUE, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"taglength", "tl", P_NUM|P_VI_DEF, (char_u *)&p_tl, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"tagrelative", "tr", P_BOOL|P_VIM, (char_u *)&p_tr, PV_NONE, - {(char_u *)FALSE, (char_u *)TRUE}}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_tags, PV_TAGS, { @@ -2427,20 +2445,20 @@ static struct vimoption #else (char_u *)"./tags,tags", #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"tagstack", "tgst", P_BOOL|P_VI_DEF, (char_u *)&p_tgst, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"term", NULL, P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, (char_u *)&T_NAME, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"termbidi", "tbidi", P_BOOL|P_VI_DEF, #ifdef FEAT_ARABIC (char_u *)&p_tbidi, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR, #ifdef FEAT_MBYTE (char_u *)&p_tenc, PV_NONE, @@ -2449,13 +2467,14 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"terse", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_terse, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"textauto", "ta", P_BOOL|P_VIM, (char_u *)&p_ta, PV_NONE, - {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE}}, + {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE} + SCRIPTID_INIT}, {"textmode", "tx", P_BOOL|P_VI_DEF|P_NO_MKRC, (char_u *)&p_tx, PV_TX, { @@ -2464,40 +2483,40 @@ static struct vimoption #else (char_u *)FALSE, #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM, (char_u *)&p_tw, PV_TW, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_INS_EXPAND (char_u *)&p_tsr, PV_TSR, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"tildeop", "top", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_to, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"timeout", "to", P_BOOL|P_VI_DEF, (char_u *)&p_timeout, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"timeoutlen", "tm", P_NUM|P_VI_DEF, (char_u *)&p_tm, PV_NONE, - {(char_u *)1000L, (char_u *)0L}}, + {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, {"title", NULL, P_BOOL|P_VI_DEF, #ifdef FEAT_TITLE (char_u *)&p_title, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"titlelen", NULL, P_NUM|P_VI_DEF, #ifdef FEAT_TITLE (char_u *)&p_titlelen, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)85L, (char_u *)0L}}, + {(char_u *)85L, (char_u *)0L} SCRIPTID_INIT}, {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC, #ifdef FEAT_TITLE (char_u *)&p_titleold, PV_NONE, @@ -2507,49 +2526,50 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"titlestring", NULL, P_STRING|P_VI_DEF, #ifdef FEAT_TITLE (char_u *)&p_titlestring, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) {"toolbar", "tb", P_STRING|P_COMMA|P_VI_DEF|P_NODUP, (char_u *)&p_toolbar, PV_NONE, - {(char_u *)"icons,tooltips", (char_u *)0L}}, + {(char_u *)"icons,tooltips", (char_u *)0L} + SCRIPTID_INIT}, #endif #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) {"toolbariconsize", "tbis", P_STRING|P_VI_DEF, (char_u *)&p_tbis, PV_NONE, - {(char_u *)"small", (char_u *)0L}}, + {(char_u *)"small", (char_u *)0L} SCRIPTID_INIT}, #endif {"ttimeout", NULL, P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_ttimeout, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"ttimeoutlen", "ttm", P_NUM|P_VI_DEF, (char_u *)&p_ttm, PV_NONE, - {(char_u *)-1L, (char_u *)0L}}, + {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT}, {"ttybuiltin", "tbi", P_BOOL|P_VI_DEF, (char_u *)&p_tbi, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, (char_u *)&p_tf, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS)) (char_u *)&p_ttym, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"ttyscroll", "tsl", P_NUM|P_VI_DEF, (char_u *)&p_ttyscroll, PV_NONE, - {(char_u *)999L, (char_u *)0L}}, + {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT}, {"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, (char_u *)&T_NAME, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"undolevels", "ul", P_NUM|P_VI_DEF, (char_u *)&p_ul, PV_NONE, { @@ -2558,19 +2578,19 @@ static struct vimoption #else (char_u *)100L, #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"updatecount", "uc", P_NUM|P_VI_DEF, (char_u *)&p_uc, PV_NONE, - {(char_u *)200L, (char_u *)0L}}, + {(char_u *)200L, (char_u *)0L} SCRIPTID_INIT}, {"updatetime", "ut", P_NUM|P_VI_DEF, (char_u *)&p_ut, PV_NONE, - {(char_u *)4000L, (char_u *)0L}}, + {(char_u *)4000L, (char_u *)0L} SCRIPTID_INIT}, {"verbose", "vbs", P_NUM|P_VI_DEF, (char_u *)&p_verbose, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_vfile, PV_NONE, - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"viewdir", "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, #ifdef FEAT_SESSION (char_u *)&p_vdir, PV_NONE, @@ -2579,7 +2599,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"viewoptions", "vop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_SESSION (char_u *)&p_vop, PV_NONE, @@ -2588,7 +2608,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"viminfo", "vi", P_STRING|P_COMMA|P_NODUP|P_SECURE, #ifdef FEAT_VIMINFO (char_u *)&p_viminfo, PV_NONE, @@ -2606,7 +2626,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM, #ifdef FEAT_VIRTUALEDIT (char_u *)&p_ve, PV_NONE, @@ -2615,51 +2635,52 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"visualbell", "vb", P_BOOL|P_VI_DEF, (char_u *)&p_vb, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"w300", NULL, P_NUM|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"w1200", NULL, P_NUM|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"w9600", NULL, P_NUM|P_VI_DEF, (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"warn", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_warn, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR, (char_u *)&p_wiv, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"whichwrap", "ww", P_STRING|P_VIM|P_COMMA|P_FLAGLIST, (char_u *)&p_ww, PV_NONE, - {(char_u *)"", (char_u *)"b,s"}}, + {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT}, {"wildchar", "wc", P_NUM|P_VIM, (char_u *)&p_wc, PV_NONE, - {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}}, + {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB} + SCRIPTID_INIT}, {"wildcharm", "wcm", P_NUM|P_VI_DEF, (char_u *)&p_wcm, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"wildignore", "wig", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_WILDIGN (char_u *)&p_wig, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"wildmenu", "wmnu", P_BOOL|P_VI_DEF, #ifdef FEAT_WILDMENU (char_u *)&p_wmnu, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"wildmode", "wim", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, (char_u *)&p_wim, PV_NONE, - {(char_u *)"full", (char_u *)0L}}, + {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT}, {"wildoptions", "wop", P_STRING|P_VI_DEF, #ifdef FEAT_CMDL_COMPL (char_u *)&p_wop, PV_NONE, @@ -2668,7 +2689,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"winaltkeys", "wak", P_STRING|P_VI_DEF, #ifdef FEAT_WAK (char_u *)&p_wak, PV_NONE, @@ -2677,67 +2698,67 @@ static struct vimoption (char_u *)NULL, PV_NONE, {(char_u *)NULL, (char_u *)0L} #endif - }, + SCRIPTID_INIT}, {"window", "wi", P_NUM|P_VI_DEF, (char_u *)&p_window, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"winheight", "wh", P_NUM|P_VI_DEF, #ifdef FEAT_WINDOWS (char_u *)&p_wh, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT, #ifdef FEAT_WINDOWS (char_u *)VAR_WIN, PV_WFH, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, #ifdef FEAT_VERTSPLIT (char_u *)VAR_WIN, PV_WFW, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"winminheight", "wmh", P_NUM|P_VI_DEF, #ifdef FEAT_WINDOWS (char_u *)&p_wmh, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winminwidth", "wmw", P_NUM|P_VI_DEF, #ifdef FEAT_VERTSPLIT (char_u *)&p_wmw, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, {"winwidth", "wiw", P_NUM|P_VI_DEF, #ifdef FEAT_VERTSPLIT (char_u *)&p_wiw, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)20L, (char_u *)0L}}, + {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, {"wrap", NULL, P_BOOL|P_VI_DEF|P_RWIN, (char_u *)VAR_WIN, PV_WRAP, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"wrapmargin", "wm", P_NUM|P_VI_DEF, (char_u *)&p_wm, PV_WM, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"wrapscan", "ws", P_BOOL|P_VI_DEF, (char_u *)&p_ws, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"write", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_write, PV_NONE, - {(char_u *)TRUE, (char_u *)0L}}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"writeany", "wa", P_BOOL|P_VI_DEF, (char_u *)&p_wa, PV_NONE, - {(char_u *)FALSE, (char_u *)0L}}, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"writebackup", "wb", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_wb, PV_NONE, { @@ -2746,15 +2767,15 @@ static struct vimoption #else (char_u *)FALSE, #endif - (char_u *)0L}}, + (char_u *)0L} SCRIPTID_INIT}, {"writedelay", "wd", P_NUM|P_VI_DEF, (char_u *)&p_wd, PV_NONE, - {(char_u *)0L, (char_u *)0L}}, + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, /* terminal output codes */ #define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \ (char_u *)&vvv, PV_NONE, \ - {(char_u *)"", (char_u *)0L}}, + {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, p_term("t_AB", T_CAB) p_term("t_AF", T_CAF) @@ -2815,7 +2836,8 @@ static struct vimoption /* terminal key codes are not in here */ - {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL}} /* end marker */ + /* end marker */ + {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT} }; #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption)) @@ -9917,7 +9939,8 @@ ExpandSettings(xp, regmatch, num_file, file) regmatch->rm_ic = ic; if (xp->xp_context != EXPAND_BOOL_SETTINGS) { - for (match = 0; match < sizeof(names) / sizeof(char *); ++match) + for (match = 0; match < (int)(sizeof(names) / sizeof(char *)); + ++match) if (vim_regexec(regmatch, (char_u *)names[match], (colnr_T)0)) { if (loop == 0) diff --git a/src/os_unix.c b/src/os_unix.c index 88b3a654..72b17c48 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -199,9 +199,7 @@ static int save_patterns __ARGS((int num_pat, char_u **pat, int *num_file, char_ #endif #ifndef SIG_ERR -# ifndef S_SPLINT_S -# define SIG_ERR ((RETSIGTYPE (*)())-1) -# endif +# define SIG_ERR ((RETSIGTYPE (*)())-1) #endif /* volatile because it is used in signal handler sig_winch(). */ @@ -443,9 +441,7 @@ mch_char_avail() #if defined(HAVE_TOTAL_MEM) || defined(PROTO) # ifdef HAVE_SYS_RESOURCE_H -# ifndef S_SPLINT_S /* splint crashes on bits/resource.h */ -# include -# endif +# include # endif # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL) # include @@ -825,7 +821,6 @@ sig_winch SIGDEFARG(sigarg) #endif #if defined(SIGINT) -/* ARGSUSED */ static RETSIGTYPE catch_sigint SIGDEFARG(sigarg) { @@ -837,7 +832,6 @@ catch_sigint SIGDEFARG(sigarg) #endif #if defined(SIGPWR) -/* ARGSUSED */ static RETSIGTYPE catch_sigpwr SIGDEFARG(sigarg) { @@ -857,7 +851,6 @@ catch_sigpwr SIGDEFARG(sigarg) /* * signal function for alarm(). */ -/* ARGSUSED */ static RETSIGTYPE sig_alarm SIGDEFARG(sigarg) { @@ -1091,7 +1084,6 @@ static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); /* * signal handler for SIGCONT */ -/* ARGSUSED */ static RETSIGTYPE sigcont_handler SIGDEFARG(sigarg) { @@ -1440,11 +1432,10 @@ x_error_handler(dpy, error_event) /* * Another X Error handler, just used to check for errors. */ -/* ARGSUSED */ static int x_error_check(dpy, error_event) - Display *dpy; - XErrorEvent *error_event; + Display *dpy UNUSED; + XErrorEvent *error_event UNUSED; { got_x_error = TRUE; return 0; @@ -1457,15 +1448,12 @@ x_error_check(dpy, error_event) */ static int x_IOerror_check __ARGS((Display *dpy)); -/* ARGSUSED */ static int x_IOerror_check(dpy) - Display *dpy; + Display *dpy UNUSED; { /* This function should not return, it causes exit(). Longjump instead. */ LONGJMP(lc_jump_env, 1); - /*NOTREACHED*/ - return 0; } # endif @@ -1474,10 +1462,9 @@ x_IOerror_check(dpy) */ static int x_IOerror_handler __ARGS((Display *dpy)); -/* ARGSUSED */ static int x_IOerror_handler(dpy) - Display *dpy; + Display *dpy UNUSED; { xterm_dpy = NULL; x11_window = 0; @@ -1486,8 +1473,6 @@ x_IOerror_handler(dpy) /* This function should not return, it causes exit(). Longjump instead. */ LONGJMP(x_jump_env, 1); - /*NOTREACHED*/ - return 0; } #endif @@ -1923,10 +1908,9 @@ set_x11_icon(icon) #else /* FEAT_X11 */ -/*ARGSUSED*/ static int get_x11_title(test_only) - int test_only; + int test_only UNUSED; { return FALSE; } @@ -2501,11 +2485,10 @@ mch_isFullName(fname) * file name to remain exactly the same. * Only required for file systems where case is ignored and preserved. */ -/*ARGSUSED*/ void fname_case(name, len) char_u *name; - int len; /* buffer size, only used when name gets longer */ + int len UNUSED; /* buffer size, only used when name gets longer */ { struct stat st; char_u *slash, *tail; @@ -5145,7 +5128,6 @@ mch_expandpath(gap, path, flags) #define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|" -/* ARGSUSED */ int mch_expand_wildcards(num_pat, pat, num_file, file, flags) int num_pat; @@ -6072,7 +6054,6 @@ sysmouse_close() /* * Gets info from sysmouse and adds special keys to input buf. */ -/* ARGSUSED */ static RETSIGTYPE sig_sysmouse SIGDEFARG(sigarg) { @@ -6636,11 +6617,10 @@ static void xsmp_handle_interaction __ARGS((SmcConn smc_conn, SmPointer client_d * This is our chance to ask the user if they want to save, * or abort the logout */ -/*ARGSUSED*/ static void xsmp_handle_interaction(smc_conn, client_data) SmcConn smc_conn; - SmPointer client_data; + SmPointer client_data UNUSED; { cmdmod_T save_cmdmod; int cancel_shutdown = False; @@ -6673,16 +6653,15 @@ xsmp_handle_interaction(smc_conn, client_data) /* * Callback that starts save-yourself. */ -/*ARGSUSED*/ static void xsmp_handle_save_yourself(smc_conn, client_data, save_type, shutdown, interact_style, fast) SmcConn smc_conn; - SmPointer client_data; - int save_type; + SmPointer client_data UNUSED; + int save_type UNUSED; Bool shutdown; - int interact_style; - Bool fast; + int interact_style UNUSED; + Bool fast UNUSED; { /* Handle already being in saveyourself */ if (xsmp.save_yourself) @@ -6716,11 +6695,10 @@ xsmp_handle_save_yourself(smc_conn, client_data, save_type, /* * Callback to warn us of imminent death. */ -/*ARGSUSED*/ static void xsmp_die(smc_conn, client_data) - SmcConn smc_conn; - SmPointer client_data; + SmcConn smc_conn UNUSED; + SmPointer client_data UNUSED; { xsmp_close(); @@ -6732,11 +6710,10 @@ xsmp_die(smc_conn, client_data) /* * Callback to tell us that save-yourself has completed. */ -/*ARGSUSED*/ static void xsmp_save_complete(smc_conn, client_data) - SmcConn smc_conn; - SmPointer client_data; + SmcConn smc_conn UNUSED; + SmPointer client_data UNUSED; { xsmp.save_yourself = False; } @@ -6746,11 +6723,10 @@ xsmp_save_complete(smc_conn, client_data) * Callback to tell us that an instigated shutdown was cancelled * (maybe even by us) */ -/*ARGSUSED*/ static void xsmp_shutdown_cancelled(smc_conn, client_data) SmcConn smc_conn; - SmPointer client_data; + SmPointer client_data UNUSED; { if (xsmp.save_yourself) SmcSaveYourselfDone(smc_conn, True); @@ -6762,13 +6738,12 @@ xsmp_shutdown_cancelled(smc_conn, client_data) /* * Callback to tell us that a new ICE connection has been established. */ -/*ARGSUSED*/ static void xsmp_ice_connection(iceConn, clientData, opening, watchData) IceConn iceConn; - IcePointer clientData; + IcePointer clientData UNUSED; Bool opening; - IcePointer *watchData; + IcePointer *watchData UNUSED; { /* Intercept creation of ICE connection fd */ if (opening) diff --git a/src/os_unix.h b/src/os_unix.h index dd70939d..944cc1b8 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -53,9 +53,7 @@ #endif #ifdef HAVE_UNISTD_H -# ifndef S_SPLINT_S /* splint crashes on bits/confname.h */ -# include -# endif +# include #endif #ifdef HAVE_LIBC_H diff --git a/src/quickfix.c b/src/quickfix.c index e374694a..3c0ed203 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2240,7 +2240,6 @@ ex_cwindow(eap) * ":cclose": close the window showing the list of errors. * ":lclose": close the window showing the location list */ -/*ARGSUSED*/ void ex_cclose(eap) exarg_T *eap; @@ -3211,7 +3210,7 @@ ex_vimgrep(eap) break; col = regmatch.endpos[0].col + (col == regmatch.endpos[0].col); - if (col > STRLEN(ml_get_buf(buf, lnum, FALSE))) + if (col > (colnr_T)STRLEN(ml_get_buf(buf, lnum, FALSE))) break; } line_breakcheck(); diff --git a/src/screen.c b/src/screen.c index c2d7c202..5d3f6fbb 100644 --- a/src/screen.c +++ b/src/screen.c @@ -270,11 +270,10 @@ redraw_buf_later(buf, type) * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot * may become invalid and the whole window will have to be redrawn. */ -/*ARGSUSED*/ void redrawWinline(lnum, invalid) linenr_T lnum; - int invalid; /* window line height is invalid now */ + int invalid UNUSED; /* window line height is invalid now */ { #ifdef FEAT_FOLDING int i; @@ -2413,7 +2412,7 @@ fold_line(wp, fold_count, foldinfo, lnum, row) && (lnume < bot->lnum || (lnume == bot->lnum && (bot->col - (*p_sel == 'e')) - >= STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) + >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) { if (VIsual_mode == Ctrl_V) { @@ -2549,14 +2548,13 @@ fill_foldcolumn(p, wp, closed, lnum) * * Return the number of last row the line occupies. */ -/* ARGSUSED */ static int win_line(wp, lnum, startrow, endrow, nochange) win_T *wp; linenr_T lnum; int startrow; int endrow; - int nochange; /* not updating for changed text */ + int nochange UNUSED; /* not updating for changed text */ { int col; /* visual column on screen */ unsigned off; /* offset in ScreenLines/ScreenAttrs */ @@ -6098,7 +6096,7 @@ win_redr_custom(wp, draw_ruler) fillchar, maxwidth, hltab, tabtab); len = (int)STRLEN(buf); - while (width < maxwidth && len < sizeof(buf) - 1) + while (width < maxwidth && len < (int)sizeof(buf) - 1) { #ifdef FEAT_MBYTE len += (*mb_char2bytes)(fillchar, buf + len); @@ -8655,7 +8653,6 @@ screen_ins_lines(off, row, line_count, end, wp) * * Return OK for success, FAIL if the lines are not deleted. */ -/*ARGSUSED*/ int screen_del_lines(off, row, line_count, end, force, wp) int off; @@ -8663,7 +8660,7 @@ screen_del_lines(off, row, line_count, end, force, wp) int line_count; int end; int force; /* even when line_count > p_ttyscroll */ - win_T *wp; /* NULL or window to use width from */ + win_T *wp UNUSED; /* NULL or window to use width from */ { int j; int i; diff --git a/src/search.c b/src/search.c index 27e94fbb..3ad9140c 100644 --- a/src/search.c +++ b/src/search.c @@ -4527,12 +4527,11 @@ linewhite(lnum) * Find identifiers or defines in included files. * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase. */ -/*ARGSUSED*/ void find_pattern_in_path(ptr, dir, len, whole, skip_comments, type, count, action, start_lnum, end_lnum) char_u *ptr; /* pointer to search pattern */ - int dir; /* direction of expansion */ + int dir UNUSED; /* direction of expansion */ int len; /* length of search pattern */ int whole; /* match whole words only */ int skip_comments; /* don't match inside comments */ diff --git a/src/spell.c b/src/spell.c index 5bfb2123..de74f611 100644 --- a/src/spell.c +++ b/src/spell.c @@ -950,8 +950,8 @@ static void close_spellbuf __ARGS((buf_T *buf)); */ #ifndef FEAT_MBYTE /* Non-multi-byte implementation. */ -# define SPELL_TOFOLD(c) ((c) < 256 ? spelltab.st_fold[c] : (c)) -# define SPELL_TOUPPER(c) ((c) < 256 ? spelltab.st_upper[c] : (c)) +# define SPELL_TOFOLD(c) ((c) < 256 ? (int)spelltab.st_fold[c] : (c)) +# define SPELL_TOUPPER(c) ((c) < 256 ? (int)spelltab.st_upper[c] : (c)) # define SPELL_ISUPPER(c) ((c) < 256 ? spelltab.st_isu[c] : FALSE) #else # if defined(HAVE_WCHAR_H) @@ -962,18 +962,18 @@ static void close_spellbuf __ARGS((buf_T *buf)); * the "w" library function for characters above 255 if available. */ # ifdef HAVE_TOWLOWER # define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \ - : (c) < 256 ? spelltab.st_fold[c] : towlower(c)) + : (c) < 256 ? (int)spelltab.st_fold[c] : (int)towlower(c)) # else # define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \ - : (c) < 256 ? spelltab.st_fold[c] : (c)) + : (c) < 256 ? (int)spelltab.st_fold[c] : (c)) # endif # ifdef HAVE_TOWUPPER # define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \ - : (c) < 256 ? spelltab.st_upper[c] : towupper(c)) + : (c) < 256 ? (int)spelltab.st_upper[c] : (int)towupper(c)) # else # define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \ - : (c) < 256 ? spelltab.st_upper[c] : (c)) + : (c) < 256 ? (int)spelltab.st_upper[c] : (c)) # endif # ifdef HAVE_ISWUPPER @@ -8052,7 +8052,7 @@ put_sugtime(spin, fd) /* time_t can be up to 8 bytes in size, more than long_u, thus we * can't use put_bytes() here. */ for (i = 7; i >= 0; --i) - if (i + 1 > sizeof(time_t)) + if (i + 1 > (int)sizeof(time_t)) /* ">>" doesn't work well when shifting more bits than avail */ putc(0, fd); else @@ -10541,10 +10541,9 @@ check_need_cap(lnum, col) /* * ":spellrepall" */ -/*ARGSUSED*/ void ex_spellrepall(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { pos_T pos = curwin->w_cursor; char_u *frompat; @@ -15604,10 +15603,9 @@ pop: /* * ":spellinfo" */ -/*ARGSUSED*/ void ex_spellinfo(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { int lpi; langp_T *lp; @@ -16153,7 +16151,7 @@ spell_expand_check_cap(col) */ int expand_spelling(lnum, pat, matchp) - linenr_T lnum; + linenr_T lnum UNUSED; char_u *pat; char_u ***matchp; { diff --git a/src/structs.h b/src/structs.h index 25012d69..95b5e626 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1646,11 +1646,7 @@ struct tabpage_S #endif #ifdef FEAT_DIFF diff_T *tp_first_diff; -# ifdef S_SPLINT_S /* splint doesn't understand the array of pointers */ - buf_T **tp_diffbuf; -# else buf_T *(tp_diffbuf[DB_COUNT]); -# endif int tp_diff_invalid; /* list of diffs is outdated */ #endif frame_T *tp_snapshot; /* window layout snapshot */ diff --git a/src/syntax.c b/src/syntax.c index 4b4b0bba..2cfec3c6 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -3224,11 +3224,10 @@ check_keyword_id(line, startcol, endcolp, flagsp, next_listp, cur_si) /* * Handle ":syntax case" command. */ -/* ARGSUSED */ static void syn_cmd_case(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { char_u *arg = eap->arg; char_u *next; @@ -3249,11 +3248,10 @@ syn_cmd_case(eap, syncing) /* * Handle ":syntax spell" command. */ -/* ARGSUSED */ static void syn_cmd_spell(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { char_u *arg = eap->arg; char_u *next; @@ -3517,11 +3515,10 @@ syn_clear_one(id, syncing) /* * Handle ":syntax on" command. */ -/* ARGSUSED */ static void syn_cmd_on(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { syn_cmd_onoff(eap, "syntax"); } @@ -3529,11 +3526,10 @@ syn_cmd_on(eap, syncing) /* * Handle ":syntax enable" command. */ -/* ARGSUSED */ static void syn_cmd_enable(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable"); syn_cmd_onoff(eap, "syntax"); @@ -3543,11 +3539,10 @@ syn_cmd_enable(eap, syncing) /* * Handle ":syntax reset" command. */ -/* ARGSUSED */ static void syn_cmd_reset(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { eap->nextcmd = check_nextcmd(eap->arg); if (!eap->skip) @@ -3561,11 +3556,10 @@ syn_cmd_reset(eap, syncing) /* * Handle ":syntax manual" command. */ -/* ARGSUSED */ static void syn_cmd_manual(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { syn_cmd_onoff(eap, "manual"); } @@ -3573,11 +3567,10 @@ syn_cmd_manual(eap, syncing) /* * Handle ":syntax off" command. */ -/* ARGSUSED */ static void syn_cmd_off(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { syn_cmd_onoff(eap, "nosyntax"); } @@ -4461,11 +4454,10 @@ syn_incl_toplevel(id, flagsp) /* * Handle ":syntax include [@{group-name}] filename" command. */ -/* ARGSUSED */ static void syn_cmd_include(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { char_u *arg = eap->arg; int sgl_id = 1; @@ -4532,11 +4524,10 @@ syn_cmd_include(eap, syncing) /* * Handle ":syntax keyword {group-name} [{option}] keyword .." command. */ -/* ARGSUSED */ static void syn_cmd_keyword(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { char_u *arg = eap->arg; char_u *group_name_end; @@ -5275,11 +5266,10 @@ syn_add_cluster(name) * Handle ":syntax cluster {cluster-name} [contains={groupname},..] * [add={groupname},..] [remove={groupname},..]". */ -/* ARGSUSED */ static void syn_cmd_cluster(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { char_u *arg = eap->arg; char_u *group_name_end; @@ -5464,11 +5454,10 @@ get_syn_pattern(arg, ci) /* * Handle ":syntax sync .." command. */ -/* ARGSUSED */ static void syn_cmd_sync(eap, syncing) exarg_T *eap; - int syncing; /* not used */ + int syncing UNUSED; { char_u *arg_start = eap->arg; char_u *arg_end; @@ -6099,10 +6088,9 @@ static char *(case_args[]) = {"match", "ignore", NULL}; * Function given to ExpandGeneric() to obtain the list syntax names for * expansion. */ -/*ARGSUSED*/ char_u * get_syntax_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { if (expand_what == EXP_SUBCMD) @@ -7744,14 +7732,13 @@ fontset_name2handle(name, fixed_width) /* * Get the font or fontset for one highlight group. */ -/*ARGSUSED*/ static void hl_do_font(idx, arg, do_normal, do_menu, do_tooltip) int idx; char_u *arg; - int do_normal; /* set normal font */ - int do_menu; /* set menu font */ - int do_tooltip; /* set tooltip font */ + int do_normal; /* set normal font */ + int do_menu UNUSED; /* set menu font */ + int do_tooltip UNUSED; /* set tooltip font */ { # ifdef FEAT_XFONTSET /* If 'guifontset' is not empty, first try using the name as a @@ -9150,10 +9137,9 @@ highlight_list_two(cnt, attr) * Function given to ExpandGeneric() to obtain the list of group names. * Also used for synIDattr() function. */ -/*ARGSUSED*/ char_u * get_highlight_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { #ifdef FEAT_CMDL_COMPL diff --git a/src/tag.c b/src/tag.c index 624989d9..5dc56d30 100644 --- a/src/tag.c +++ b/src/tag.c @@ -100,7 +100,7 @@ static char_u *tagmatchname = NULL; /* name of last used tag */ * Tag for preview window is remembered separately, to avoid messing up the * normal tagstack. */ -static taggy_T ptag_entry = {NULL}; +static taggy_T ptag_entry = {NULL, {INIT_POS_T(0, 0, 0), 0}, 0, 0}; #endif /* @@ -3791,7 +3791,7 @@ add_tag_field(dict, field_name, start, end) --end; } len = (int)(end - start); - if (len > sizeof(buf) - 1) + if (len > (int)sizeof(buf) - 1) len = sizeof(buf) - 1; vim_strncpy(buf, start, len); } diff --git a/src/term.c b/src/term.c index 496e2ffa..68b3b65a 100644 --- a/src/term.c +++ b/src/term.c @@ -2906,7 +2906,7 @@ add_long_to_buf(val, dst) int i; int shift; - for (i = 1; i <= sizeof(long_u); i++) + for (i = 1; i <= (int)sizeof(long_u); i++) { shift = 8 * (sizeof(long_u) - i); dst[i - 1] = (char_u) ((val >> shift) & 0xff); @@ -2937,7 +2937,7 @@ get_long_from_buf(buf, val) len = get_bytes_from_buf(buf, bytes, (int)sizeof(long_u)); if (len != -1) { - for (i = 0; i < sizeof(long_u); i++) + for (i = 0; i < (int)sizeof(long_u); i++) { shift = 8 * (sizeof(long_u) - 1 - i); *val += (long_u)bytes[i] << shift; diff --git a/src/term.h b/src/term.h index b1fde048..cc9f8ac9 100644 --- a/src/term.h +++ b/src/term.h @@ -96,11 +96,7 @@ enum SpecialKey * - there should be code in term.c to obtain the value from the termcap */ -#ifdef S_SPLINT_S /* splint doesn't understand array of pointers */ -extern char_u **term_strings; /* current terminal strings */ -#else extern char_u *(term_strings[]); /* current terminal strings */ -#endif /* * strings used for terminal diff --git a/src/ui.c b/src/ui.c index 8cff1d82..443f9c46 100644 --- a/src/ui.c +++ b/src/ui.c @@ -320,10 +320,9 @@ ui_get_shellsize() * The gui_set_shellsize() or mch_set_shellsize() function will try to set the * new size. If this is not possible, it will adjust Rows and Columns. */ -/*ARGSUSED*/ void ui_set_shellsize(mustset) - int mustset; /* set by the user */ + int mustset UNUSED; /* set by the user */ { #ifdef FEAT_GUI if (gui.in_use) @@ -1127,10 +1126,9 @@ clip_invert_rectangle(row, col, height, width, invert) * available for pasting. * When "both" is TRUE also copy to the '+' register. */ -/*ARGSUSED*/ void clip_copy_modeless_selection(both) - int both; + int both UNUSED; { char_u *buffer; char_u *bufp; @@ -1701,10 +1699,9 @@ read_from_input_buf(buf, maxlen) return (int)maxlen; } -/*ARGSUSED*/ void fill_input_buf(exit_on_error) - int exit_on_error; + int exit_on_error UNUSED; { #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX) int len; @@ -1992,11 +1989,10 @@ x11_setup_atoms(dpy) static void clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *)); -/* ARGSUSED */ static void clip_x11_request_selection_cb(w, success, sel_atom, type, value, length, format) - Widget w; + Widget w UNUSED; XtPointer success; Atom *sel_atom; Atom *type; @@ -2202,10 +2198,9 @@ clip_x11_request_selection(myShell, dpy, cbd) static Boolean clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *)); -/* ARGSUSED */ static Boolean clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format) - Widget w; + Widget w UNUSED; Atom *sel_atom; Atom *target; Atom *type; @@ -2332,10 +2327,9 @@ clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format) static void clip_x11_lose_ownership_cb __ARGS((Widget, Atom *)); -/* ARGSUSED */ static void clip_x11_lose_ownership_cb(w, sel_atom) - Widget w; + Widget w UNUSED; Atom *sel_atom; { if (*sel_atom == clip_plus.sel_atom) @@ -2368,10 +2362,9 @@ clip_x11_own_selection(myShell, cbd) * Send the current selection to the clipboard. Do nothing for X because we * will fill in the selection only when requested by another app. */ -/*ARGSUSED*/ void clip_x11_set_selection(cbd) - VimClipboard *cbd; + VimClipboard *cbd UNUSED; { } #endif @@ -2922,11 +2915,10 @@ mouse_comp_pos(win, rowp, colp, lnump) * Find the window at screen position "*rowp" and "*colp". The positions are * updated to become relative to the top-left of the window. */ -/*ARGSUSED*/ win_T * mouse_find_win(rowp, colp) int *rowp; - int *colp; + int *colp UNUSED; { frame_T *fp; diff --git a/src/version.c b/src/version.c index 5e4ec798..edaa8b7e 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,22 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 182, +/**/ + 181, +/**/ + 180, +/**/ + 179, +/**/ + 178, +/**/ + 177, +/**/ + 176, +/**/ + 175, +/**/ 174, /**/ 173, -- 2.11.4.GIT