Mercurial > vim

comparison src/option.c @ 5735:50dbef5e774a v7.4.212

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5734:657ade71d395 5735:50dbef5e774a
1627 (char_u *)NULL, PV_NONE, 1627 (char_u *)NULL, PV_NONE,
1628 {(char_u *)"", (char_u *)0L} 1628 {(char_u *)"", (char_u *)0L}
1629 #endif 1629 #endif
1630 SCRIPTID_INIT}, 1630 SCRIPTID_INIT},
1631 {"keymodel", "km", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1631 {"keymodel", "km", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
1632 #ifdef FEAT_VISUAL
1633 (char_u *)&p_km, PV_NONE, 1632 (char_u *)&p_km, PV_NONE,
1634 #else
1635 (char_u *)NULL, PV_NONE,
1636 #endif
1637 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 1633 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1638 {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, 1634 {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
1639 (char_u *)&p_kp, PV_KP, 1635 (char_u *)&p_kp, PV_KP,
1640 { 1636 {
1641 #if defined(MSDOS) || defined(MSWIN) 1637 #if defined(MSDOS) || defined(MSWIN)
2188 SCRIPTID_INIT}, 2184 SCRIPTID_INIT},
2189 {"secure", NULL, P_BOOL|P_VI_DEF|P_SECURE, 2185 {"secure", NULL, P_BOOL|P_VI_DEF|P_SECURE,
2190 (char_u *)&p_secure, PV_NONE, 2186 (char_u *)&p_secure, PV_NONE,
2191 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 2187 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
2192 {"selection", "sel", P_STRING|P_VI_DEF, 2188 {"selection", "sel", P_STRING|P_VI_DEF,
2193 #ifdef FEAT_VISUAL
2194 (char_u *)&p_sel, PV_NONE, 2189 (char_u *)&p_sel, PV_NONE,
2195 #else
2196 (char_u *)NULL, PV_NONE,
2197 #endif
2198 {(char_u *)"inclusive", (char_u *)0L} 2190 {(char_u *)"inclusive", (char_u *)0L}
2199 SCRIPTID_INIT}, 2191 SCRIPTID_INIT},
2200 {"selectmode", "slm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2192 {"selectmode", "slm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
2201 #ifdef FEAT_VISUAL
2202 (char_u *)&p_slm, PV_NONE, 2193 (char_u *)&p_slm, PV_NONE,
2203 #else
2204 (char_u *)NULL, PV_NONE,
2205 #endif
2206 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2194 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2207 {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2195 {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
2208 #ifdef FEAT_SESSION 2196 #ifdef FEAT_SESSION
2209 (char_u *)&p_ssop, PV_NONE, 2197 (char_u *)&p_ssop, PV_NONE,
2210 {(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize", 2198 {(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize",
2977 #endif 2965 #endif
2978 #ifdef FEAT_WAK 2966 #ifdef FEAT_WAK
2979 static char *(p_wak_values[]) = {"yes", "menu", "no", NULL}; 2967 static char *(p_wak_values[]) = {"yes", "menu", "no", NULL};
2980 #endif 2968 #endif
2981 static char *(p_mousem_values[]) = {"extend", "popup", "popup_setpos", "mac", NULL}; 2969 static char *(p_mousem_values[]) = {"extend", "popup", "popup_setpos", "mac", NULL};
2982 #ifdef FEAT_VISUAL
2983 static char *(p_sel_values[]) = {"inclusive", "exclusive", "old", NULL}; 2970 static char *(p_sel_values[]) = {"inclusive", "exclusive", "old", NULL};
2984 static char *(p_slm_values[]) = {"mouse", "key", "cmd", NULL}; 2971 static char *(p_slm_values[]) = {"mouse", "key", "cmd", NULL};
2985 #endif
2986 #ifdef FEAT_VISUAL
2987 static char *(p_km_values[]) = {"startsel", "stopsel", NULL}; 2972 static char *(p_km_values[]) = {"startsel", "stopsel", NULL};
2988 #endif
2989 #ifdef FEAT_BROWSE 2973 #ifdef FEAT_BROWSE
2990 static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL}; 2974 static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL};
2991 #endif 2975 #endif
2992 #ifdef FEAT_SCROLLBIND 2976 #ifdef FEAT_SCROLLBIND
2993 static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL}; 2977 static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL};
6576 if (termcap_active) 6560 if (termcap_active)
6577 setmouse(); /* may switch it on again */ 6561 setmouse(); /* may switch it on again */
6578 } 6562 }
6579 #endif 6563 #endif
6580 6564
6581 #ifdef FEAT_VISUAL
6582 /* 'selection' */ 6565 /* 'selection' */
6583 else if (varp == &p_sel) 6566 else if (varp == &p_sel)
6584 { 6567 {
6585 if (*p_sel == NUL 6568 if (*p_sel == NUL
6586 || check_opt_strings(p_sel, p_sel_values, FALSE) != OK) 6569 || check_opt_strings(p_sel, p_sel_values, FALSE) != OK)
6591 else if (varp == &p_slm) 6574 else if (varp == &p_slm)
6592 { 6575 {
6593 if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK) 6576 if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK)
6594 errmsg = e_invarg; 6577 errmsg = e_invarg;
6595 } 6578 }
6596 #endif
6597 6579
6598 #ifdef FEAT_BROWSE 6580 #ifdef FEAT_BROWSE
6599 /* 'browsedir' */ 6581 /* 'browsedir' */
6600 else if (varp == &p_bsdir) 6582 else if (varp == &p_bsdir)
6601 { 6583 {
6603 && !mch_isdir(p_bsdir)) 6585 && !mch_isdir(p_bsdir))
6604 errmsg = e_invarg; 6586 errmsg = e_invarg;
6605 } 6587 }
6606 #endif 6588 #endif
6607 6589
6608 #ifdef FEAT_VISUAL
6609 /* 'keymodel' */ 6590 /* 'keymodel' */
6610 else if (varp == &p_km) 6591 else if (varp == &p_km)
6611 { 6592 {
6612 if (check_opt_strings(p_km, p_km_values, TRUE) != OK) 6593 if (check_opt_strings(p_km, p_km_values, TRUE) != OK)
6613 errmsg = e_invarg; 6594 errmsg = e_invarg;
6615 { 6596 {
6616 km_stopsel = (vim_strchr(p_km, 'o') != NULL); 6597 km_stopsel = (vim_strchr(p_km, 'o') != NULL);
6617 km_startsel = (vim_strchr(p_km, 'a') != NULL); 6598 km_startsel = (vim_strchr(p_km, 'a') != NULL);
6618 } 6599 }
6619 } 6600 }
6620 #endif
6621 6601
6622 /* 'mousemodel' */ 6602 /* 'mousemodel' */
6623 else if (varp == &p_mousem) 6603 else if (varp == &p_mousem)
6624 { 6604 {
6625 if (check_opt_strings(p_mousem, p_mousem_values, FALSE) != OK) 6605 if (check_opt_strings(p_mousem, p_mousem_values, FALSE) != OK)