Mercurial > vim
diff src/option.c @ 5735:50dbef5e774a v7.4.212
updated for version 7.4.212
Problem: Now that the +visual feature is always enabled the #ifdefs for it
are not useful.
Solution: Remove the checks for FEAT_VISUAL.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 23 Mar 2014 15:13:05 +0100 |
| parents | 06e5f65c34d8 |
| children | a6b59ee633a3 |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -1629,11 +1629,7 @@ static struct vimoption #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} SCRIPTID_INIT}, {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_kp, PV_KP, @@ -2190,19 +2186,11 @@ static struct vimoption (char_u *)&p_secure, PV_NONE, {(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} 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} SCRIPTID_INIT}, {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_SESSION @@ -2979,13 +2967,9 @@ static char *(p_wop_values[]) = {"tagfil static char *(p_wak_values[]) = {"yes", "menu", "no", NULL}; #endif static char *(p_mousem_values[]) = {"extend", "popup", "popup_setpos", "mac", NULL}; -#ifdef FEAT_VISUAL static char *(p_sel_values[]) = {"inclusive", "exclusive", "old", NULL}; static char *(p_slm_values[]) = {"mouse", "key", "cmd", NULL}; -#endif -#ifdef FEAT_VISUAL static char *(p_km_values[]) = {"startsel", "stopsel", NULL}; -#endif #ifdef FEAT_BROWSE static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL}; #endif @@ -6578,7 +6562,6 @@ did_set_string_option(opt_idx, varp, new } #endif -#ifdef FEAT_VISUAL /* 'selection' */ else if (varp == &p_sel) { @@ -6593,7 +6576,6 @@ did_set_string_option(opt_idx, varp, new if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK) errmsg = e_invarg; } -#endif #ifdef FEAT_BROWSE /* 'browsedir' */ @@ -6605,7 +6587,6 @@ did_set_string_option(opt_idx, varp, new } #endif -#ifdef FEAT_VISUAL /* 'keymodel' */ else if (varp == &p_km) { @@ -6617,7 +6598,6 @@ did_set_string_option(opt_idx, varp, new km_startsel = (vim_strchr(p_km, 'a') != NULL); } } -#endif /* 'mousemodel' */ else if (varp == &p_mousem)