Mercurial > vim

comparison src/optiondefs.h @ 28942:6cdf55afaae9 v8.2.4993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4993: smart/C/lisp indenting is optional Commit: https://github.com/vim/vim/commit/8e145b82464a21ee4fdf7948f04e2a1d505f8bfa Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 21 20:17:31 2022 +0100 patch 8.2.4993: smart/C/lisp indenting is optional Problem: smart/C/lisp indenting is optional, which makes the code more complex, while it only reduces the executable size a bit. Solution: Graduate FEAT_CINDENT, FEAT_SMARTINDENT and FEAT_LISP.
author Bram Moolenaar <Bram@vim.org>
date Sat, 21 May 2022 21:30:04 +0200
parents d395fadbaf67
children 60977de70684
comparison
equal deleted inserted replaced
28941:f17de8647585 28942:6cdf55afaae9
38 #endif 38 #endif
39 #define PV_BIN OPT_BUF(BV_BIN) 39 #define PV_BIN OPT_BUF(BV_BIN)
40 #define PV_BL OPT_BUF(BV_BL) 40 #define PV_BL OPT_BUF(BV_BL)
41 #define PV_BOMB OPT_BUF(BV_BOMB) 41 #define PV_BOMB OPT_BUF(BV_BOMB)
42 #define PV_CI OPT_BUF(BV_CI) 42 #define PV_CI OPT_BUF(BV_CI)
43 #ifdef FEAT_CINDENT 43 #define PV_CIN OPT_BUF(BV_CIN)
44 # define PV_CIN OPT_BUF(BV_CIN) 44 #define PV_CINK OPT_BUF(BV_CINK)
45 # define PV_CINK OPT_BUF(BV_CINK) 45 #define PV_CINO OPT_BUF(BV_CINO)
46 # define PV_CINO OPT_BUF(BV_CINO) 46 #define PV_CINSD OPT_BUF(BV_CINSD)
47 # define PV_CINSD OPT_BUF(BV_CINSD) 47 #define PV_CINW OPT_BUF(BV_CINW)
48 #endif
49 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
50 # define PV_CINW OPT_BUF(BV_CINW)
51 #endif
52 #define PV_CM OPT_BOTH(OPT_BUF(BV_CM)) 48 #define PV_CM OPT_BOTH(OPT_BUF(BV_CM))
53 #ifdef FEAT_FOLDING 49 #ifdef FEAT_FOLDING
54 # define PV_CMS OPT_BUF(BV_CMS) 50 # define PV_CMS OPT_BUF(BV_CMS)
55 #endif 51 #endif
56 #define PV_COM OPT_BUF(BV_COM) 52 #define PV_COM OPT_BUF(BV_COM)
81 #define PV_FLP OPT_BUF(BV_FLP) 77 #define PV_FLP OPT_BUF(BV_FLP)
82 #define PV_FO OPT_BUF(BV_FO) 78 #define PV_FO OPT_BUF(BV_FO)
83 #define PV_FT OPT_BUF(BV_FT) 79 #define PV_FT OPT_BUF(BV_FT)
84 #define PV_IMI OPT_BUF(BV_IMI) 80 #define PV_IMI OPT_BUF(BV_IMI)
85 #define PV_IMS OPT_BUF(BV_IMS) 81 #define PV_IMS OPT_BUF(BV_IMS)
86 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 82 #if defined(FEAT_EVAL)
87 # define PV_INDE OPT_BUF(BV_INDE) 83 # define PV_INDE OPT_BUF(BV_INDE)
88 # define PV_INDK OPT_BUF(BV_INDK) 84 # define PV_INDK OPT_BUF(BV_INDK)
89 #endif 85 #endif
90 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) 86 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
91 # define PV_INEX OPT_BUF(BV_INEX) 87 # define PV_INEX OPT_BUF(BV_INEX)
97 #endif 93 #endif
98 #ifdef FEAT_KEYMAP 94 #ifdef FEAT_KEYMAP
99 # define PV_KMAP OPT_BUF(BV_KMAP) 95 # define PV_KMAP OPT_BUF(BV_KMAP)
100 #endif 96 #endif
101 #define PV_KP OPT_BOTH(OPT_BUF(BV_KP)) 97 #define PV_KP OPT_BOTH(OPT_BUF(BV_KP))
102 #ifdef FEAT_LISP 98 #define PV_LISP OPT_BUF(BV_LISP)
103 # define PV_LISP OPT_BUF(BV_LISP) 99 #define PV_LW OPT_BOTH(OPT_BUF(BV_LW))
104 # define PV_LW OPT_BOTH(OPT_BUF(BV_LW))
105 #endif
106 #define PV_MENC OPT_BOTH(OPT_BUF(BV_MENC)) 100 #define PV_MENC OPT_BOTH(OPT_BUF(BV_MENC))
107 #define PV_MA OPT_BUF(BV_MA) 101 #define PV_MA OPT_BUF(BV_MA)
108 #define PV_ML OPT_BUF(BV_ML) 102 #define PV_ML OPT_BUF(BV_ML)
109 #define PV_MOD OPT_BUF(BV_MOD) 103 #define PV_MOD OPT_BUF(BV_MOD)
110 #define PV_MPS OPT_BUF(BV_MPS) 104 #define PV_MPS OPT_BUF(BV_MPS)
116 #define PV_PI OPT_BUF(BV_PI) 110 #define PV_PI OPT_BUF(BV_PI)
117 #ifdef FEAT_TEXTOBJ 111 #ifdef FEAT_TEXTOBJ
118 # define PV_QE OPT_BUF(BV_QE) 112 # define PV_QE OPT_BUF(BV_QE)
119 #endif 113 #endif
120 #define PV_RO OPT_BUF(BV_RO) 114 #define PV_RO OPT_BUF(BV_RO)
121 #ifdef FEAT_SMARTINDENT 115 #define PV_SI OPT_BUF(BV_SI)
122 # define PV_SI OPT_BUF(BV_SI)
123 #endif
124 #define PV_SN OPT_BUF(BV_SN) 116 #define PV_SN OPT_BUF(BV_SN)
125 #ifdef FEAT_SYN_HL 117 #ifdef FEAT_SYN_HL
126 # define PV_SMC OPT_BUF(BV_SMC) 118 # define PV_SMC OPT_BUF(BV_SMC)
127 # define PV_SYN OPT_BUF(BV_SYN) 119 # define PV_SYN OPT_BUF(BV_SYN)
128 #endif 120 #endif
580 (char_u *)NULL, PV_NONE, 572 (char_u *)NULL, PV_NONE,
581 {(char_u *)0L, (char_u *)0L} 573 {(char_u *)0L, (char_u *)0L}
582 #endif 574 #endif
583 SCTX_INIT}, 575 SCTX_INIT},
584 {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM, 576 {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM,
585 #ifdef FEAT_CINDENT
586 (char_u *)&p_cin, PV_CIN, 577 (char_u *)&p_cin, PV_CIN,
587 #else
588 (char_u *)NULL, PV_NONE,
589 #endif
590 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 578 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
591 {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, 579 {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
592 #ifdef FEAT_CINDENT
593 (char_u *)&p_cink, PV_CINK, 580 (char_u *)&p_cink, PV_CINK,
594 {INDENTKEYS_DEFAULT, (char_u *)0L} 581 {INDENTKEYS_DEFAULT, (char_u *)0L} SCTX_INIT},
595 #else
596 (char_u *)NULL, PV_NONE,
597 {(char_u *)0L, (char_u *)0L}
598 #endif
599 SCTX_INIT},
600 {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, 582 {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
601 #ifdef FEAT_CINDENT
602 (char_u *)&p_cino, PV_CINO, 583 (char_u *)&p_cino, PV_CINO,
603 #else
604 (char_u *)NULL, PV_NONE,
605 #endif
606 {(char_u *)"", (char_u *)0L} SCTX_INIT}, 584 {(char_u *)"", (char_u *)0L} SCTX_INIT},
607 {"cinscopedecls", "cinsd", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, 585 {"cinscopedecls", "cinsd", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
608 #ifdef FEAT_CINDENT
609 (char_u *)&p_cinsd, PV_CINSD, 586 (char_u *)&p_cinsd, PV_CINSD,
610 {(char_u *)"public,protected,private", (char_u *)0L} 587 {(char_u *)"public,protected,private", (char_u *)0L}
611 #else
612 (char_u *)NULL, PV_NONE,
613 {(char_u *)0L, (char_u *)0L}
614 #endif
615 SCTX_INIT}, 588 SCTX_INIT},
616 {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, 589 {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
617 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
618 (char_u *)&p_cinw, PV_CINW, 590 (char_u *)&p_cinw, PV_CINW,
619 {(char_u *)"if,else,while,do,for,switch", 591 {(char_u *)"if,else,while,do,for,switch",
620 (char_u *)0L} 592 (char_u *)0L}
621 #else
622 (char_u *)NULL, PV_NONE,
623 {(char_u *)0L, (char_u *)0L}
624 #endif
625 SCTX_INIT}, 593 SCTX_INIT},
626 {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, 594 {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
627 #ifdef FEAT_CLIPBOARD 595 #ifdef FEAT_CLIPBOARD
628 (char_u *)&p_cb, PV_NONE, 596 (char_u *)&p_cb, PV_NONE,
629 # ifdef FEAT_XCLIPBOARD 597 # ifdef FEAT_XCLIPBOARD
1404 SCTX_INIT}, 1372 SCTX_INIT},
1405 {"incsearch", "is", P_BOOL|P_VI_DEF|P_VIM, 1373 {"incsearch", "is", P_BOOL|P_VI_DEF|P_VIM,
1406 (char_u *)&p_is, PV_NONE, 1374 (char_u *)&p_is, PV_NONE,
1407 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 1375 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
1408 {"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM|P_MLE, 1376 {"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM|P_MLE,
1409 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 1377 #if defined(FEAT_EVAL)
1410 (char_u *)&p_inde, PV_INDE, 1378 (char_u *)&p_inde, PV_INDE,
1411 {(char_u *)"", (char_u *)0L} 1379 {(char_u *)"", (char_u *)0L}
1412 #else 1380 #else
1413 (char_u *)NULL, PV_NONE, 1381 (char_u *)NULL, PV_NONE,
1414 {(char_u *)0L, (char_u *)0L} 1382 {(char_u *)0L, (char_u *)0L}
1415 #endif 1383 #endif
1416 SCTX_INIT}, 1384 SCTX_INIT},
1417 {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, 1385 {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
1418 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 1386 #if defined(FEAT_EVAL)
1419 (char_u *)&p_indk, PV_INDK, 1387 (char_u *)&p_indk, PV_INDK,
1420 {INDENTKEYS_DEFAULT, (char_u *)0L} 1388 {INDENTKEYS_DEFAULT, (char_u *)0L}
1421 #else 1389 #else
1422 (char_u *)NULL, PV_NONE, 1390 (char_u *)NULL, PV_NONE,
1423 {(char_u *)0L, (char_u *)0L} 1391 {(char_u *)0L, (char_u *)0L}
1574 #else 1542 #else
1575 {(char_u *)0L, (char_u *)0L} 1543 {(char_u *)0L, (char_u *)0L}
1576 #endif 1544 #endif
1577 SCTX_INIT}, 1545 SCTX_INIT},
1578 {"lisp", NULL, P_BOOL|P_VI_DEF, 1546 {"lisp", NULL, P_BOOL|P_VI_DEF,
1579 #ifdef FEAT_LISP
1580 (char_u *)&p_lisp, PV_LISP, 1547 (char_u *)&p_lisp, PV_LISP,
1581 #else
1582 (char_u *)NULL, PV_NONE,
1583 #endif
1584 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 1548 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
1585 {"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, 1549 {"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1586 #ifdef FEAT_LISP
1587 (char_u *)&p_lispwords, PV_LW, 1550 (char_u *)&p_lispwords, PV_LW,
1588 {(char_u *)LISPWORD_VALUE, (char_u *)0L} 1551 {(char_u *)LISPWORD_VALUE, (char_u *)0L} SCTX_INIT},
1589 #else
1590 (char_u *)NULL, PV_NONE,
1591 {(char_u *)"", (char_u *)0L}
1592 #endif
1593 SCTX_INIT},
1594 {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN, 1552 {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN,
1595 (char_u *)VAR_WIN, PV_LIST, 1553 (char_u *)VAR_WIN, PV_LIST,
1596 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 1554 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
1597 {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP, 1555 {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP,
1598 (char_u *)&p_lcs, PV_LCS, 1556 (char_u *)&p_lcs, PV_LCS,
2340 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2298 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2341 {"smartcase", "scs", P_BOOL|P_VI_DEF|P_VIM, 2299 {"smartcase", "scs", P_BOOL|P_VI_DEF|P_VIM,
2342 (char_u *)&p_scs, PV_NONE, 2300 (char_u *)&p_scs, PV_NONE,
2343 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2301 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2344 {"smartindent", "si", P_BOOL|P_VI_DEF|P_VIM, 2302 {"smartindent", "si", P_BOOL|P_VI_DEF|P_VIM,
2345 #ifdef FEAT_SMARTINDENT
2346 (char_u *)&p_si, PV_SI, 2303 (char_u *)&p_si, PV_SI,
2347 #else
2348 (char_u *)NULL, PV_NONE,
2349 #endif
2350 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2304 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2351 {"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM, 2305 {"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM,
2352 (char_u *)&p_sta, PV_NONE, 2306 (char_u *)&p_sta, PV_NONE,
2353 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2307 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2354 {"softtabstop", "sts", P_NUM|P_VI_DEF|P_VIM, 2308 {"softtabstop", "sts", P_NUM|P_VI_DEF|P_VIM,