Mercurial > vim

comparison src/option.c @ 15636:6f1c7e9a6393 v8.1.0826

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0826: too many #ifdefs commit https://github.com/vim/vim/commit/29ddebef4038d2d2b3bc9d8d3b0109f4046d6fbf Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 26 17:28:26 2019 +0100 patch 8.1.0826: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate FEAT_VIRTUALEDIT. Adds about 10Kbyte to the code.
author Bram Moolenaar <Bram@vim.org>
date Sat, 26 Jan 2019 17:30:15 +0100
parents 90f01701ecad
children 9cd11f6beb70
comparison
equal deleted inserted replaced
15635:c51d2a06f5f9 15636:6f1c7e9a6393
2937 {(char_u *)0L, (char_u *)0L} 2937 {(char_u *)0L, (char_u *)0L}
2938 #endif 2938 #endif
2939 SCTX_INIT}, 2939 SCTX_INIT},
2940 {"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF 2940 {"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF
2941 |P_VIM|P_CURSWANT, 2941 |P_VIM|P_CURSWANT,
2942 #ifdef FEAT_VIRTUALEDIT
2943 (char_u *)&p_ve, PV_NONE, 2942 (char_u *)&p_ve, PV_NONE,
2944 {(char_u *)"", (char_u *)""} 2943 {(char_u *)"", (char_u *)""}
2945 #else
2946 (char_u *)NULL, PV_NONE,
2947 {(char_u *)0L, (char_u *)0L}
2948 #endif
2949 SCTX_INIT}, 2944 SCTX_INIT},
2950 {"visualbell", "vb", P_BOOL|P_VI_DEF, 2945 {"visualbell", "vb", P_BOOL|P_VI_DEF,
2951 (char_u *)&p_vb, PV_NONE, 2946 (char_u *)&p_vb, PV_NONE,
2952 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2947 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2953 {"w300", NULL, P_NUM|P_VI_DEF, 2948 {"w300", NULL, P_NUM|P_VI_DEF,
5524 #ifdef FEAT_FOLDING 5519 #ifdef FEAT_FOLDING
5525 (void)opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE); 5520 (void)opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE);
5526 #endif 5521 #endif
5527 (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE); 5522 (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE);
5528 (void)opt_strings_flags(p_tc, p_tc_values, &tc_flags, FALSE); 5523 (void)opt_strings_flags(p_tc, p_tc_values, &tc_flags, FALSE);
5529 #ifdef FEAT_VIRTUALEDIT
5530 (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE); 5524 (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE);
5531 #endif
5532 #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS)) 5525 #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
5533 (void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE); 5526 (void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE);
5534 #endif 5527 #endif
5535 #ifdef FEAT_SPELL 5528 #ifdef FEAT_SPELL
5536 (void)spell_check_msm(); 5529 (void)spell_check_msm();
7372 if (foldmethodIsIndent(curwin)) 7365 if (foldmethodIsIndent(curwin))
7373 foldUpdateAll(curwin); 7366 foldUpdateAll(curwin);
7374 } 7367 }
7375 #endif 7368 #endif
7376 7369
7377 #ifdef FEAT_VIRTUALEDIT
7378 /* 'virtualedit' */ 7370 /* 'virtualedit' */
7379 else if (varp == &p_ve) 7371 else if (varp == &p_ve)
7380 { 7372 {
7381 if (opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE) != OK) 7373 if (opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE) != OK)
7382 errmsg = e_invarg; 7374 errmsg = e_invarg;
7386 * changes something. */ 7378 * changes something. */
7387 validate_virtcol(); 7379 validate_virtcol();
7388 coladvance(curwin->w_virtcol); 7380 coladvance(curwin->w_virtcol);
7389 } 7381 }
7390 } 7382 }
7391 #endif
7392 7383
7393 #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX) 7384 #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
7394 else if (varp == &p_csqf) 7385 else if (varp == &p_csqf)
7395 { 7386 {
7396 if (p_csqf != NULL) 7387 if (p_csqf != NULL)