forked from aniani/vim
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.
This commit is contained in:
Bram Moolenaar
@@ -40,15 +40,11 @@
|
||||
#define PV_BL OPT_BUF(BV_BL)
|
||||
#define PV_BOMB OPT_BUF(BV_BOMB)
|
||||
#define PV_CI OPT_BUF(BV_CI)
|
||||
#ifdef FEAT_CINDENT
|
||||
# define PV_CIN OPT_BUF(BV_CIN)
|
||||
# define PV_CINK OPT_BUF(BV_CINK)
|
||||
# define PV_CINO OPT_BUF(BV_CINO)
|
||||
# define PV_CINSD OPT_BUF(BV_CINSD)
|
||||
#endif
|
||||
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
|
||||
# define PV_CINW OPT_BUF(BV_CINW)
|
||||
#endif
|
||||
#define PV_CIN OPT_BUF(BV_CIN)
|
||||
#define PV_CINK OPT_BUF(BV_CINK)
|
||||
#define PV_CINO OPT_BUF(BV_CINO)
|
||||
#define PV_CINSD OPT_BUF(BV_CINSD)
|
||||
#define PV_CINW OPT_BUF(BV_CINW)
|
||||
#define PV_CM OPT_BOTH(OPT_BUF(BV_CM))
|
||||
#ifdef FEAT_FOLDING
|
||||
# define PV_CMS OPT_BUF(BV_CMS)
|
||||
@@ -83,7 +79,7 @@
|
||||
#define PV_FT OPT_BUF(BV_FT)
|
||||
#define PV_IMI OPT_BUF(BV_IMI)
|
||||
#define PV_IMS OPT_BUF(BV_IMS)
|
||||
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
|
||||
#if defined(FEAT_EVAL)
|
||||
# define PV_INDE OPT_BUF(BV_INDE)
|
||||
# define PV_INDK OPT_BUF(BV_INDK)
|
||||
#endif
|
||||
@@ -99,10 +95,8 @@
|
||||
# define PV_KMAP OPT_BUF(BV_KMAP)
|
||||
#endif
|
||||
#define PV_KP OPT_BOTH(OPT_BUF(BV_KP))
|
||||
#ifdef FEAT_LISP
|
||||
# define PV_LISP OPT_BUF(BV_LISP)
|
||||
# define PV_LW OPT_BOTH(OPT_BUF(BV_LW))
|
||||
#endif
|
||||
#define PV_LISP OPT_BUF(BV_LISP)
|
||||
#define PV_LW OPT_BOTH(OPT_BUF(BV_LW))
|
||||
#define PV_MENC OPT_BOTH(OPT_BUF(BV_MENC))
|
||||
#define PV_MA OPT_BUF(BV_MA)
|
||||
#define PV_ML OPT_BUF(BV_ML)
|
||||
@@ -118,9 +112,7 @@
|
||||
# define PV_QE OPT_BUF(BV_QE)
|
||||
#endif
|
||||
#define PV_RO OPT_BUF(BV_RO)
|
||||
#ifdef FEAT_SMARTINDENT
|
||||
# define PV_SI OPT_BUF(BV_SI)
|
||||
#endif
|
||||
#define PV_SI OPT_BUF(BV_SI)
|
||||
#define PV_SN OPT_BUF(BV_SN)
|
||||
#ifdef FEAT_SYN_HL
|
||||
# define PV_SMC OPT_BUF(BV_SMC)
|
||||
@@ -582,46 +574,22 @@ static struct vimoption options[] =
|
||||
#endif
|
||||
SCTX_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} SCTX_INIT},
|
||||
{"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#ifdef FEAT_CINDENT
|
||||
(char_u *)&p_cink, PV_CINK,
|
||||
{INDENTKEYS_DEFAULT, (char_u *)0L}
|
||||
#else
|
||||
(char_u *)NULL, PV_NONE,
|
||||
{(char_u *)0L, (char_u *)0L}
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{INDENTKEYS_DEFAULT, (char_u *)0L} SCTX_INIT},
|
||||
{"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#ifdef FEAT_CINDENT
|
||||
(char_u *)&p_cino, PV_CINO,
|
||||
#else
|
||||
(char_u *)NULL, PV_NONE,
|
||||
#endif
|
||||
{(char_u *)"", (char_u *)0L} SCTX_INIT},
|
||||
{"cinscopedecls", "cinsd", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#ifdef FEAT_CINDENT
|
||||
(char_u *)&p_cinsd, PV_CINSD,
|
||||
{(char_u *)"public,protected,private", (char_u *)0L}
|
||||
#else
|
||||
(char_u *)NULL, PV_NONE,
|
||||
{(char_u *)0L, (char_u *)0L}
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
|
||||
(char_u *)&p_cinw, PV_CINW,
|
||||
{(char_u *)"if,else,while,do,for,switch",
|
||||
(char_u *)0L}
|
||||
#else
|
||||
(char_u *)NULL, PV_NONE,
|
||||
{(char_u *)0L, (char_u *)0L}
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#ifdef FEAT_CLIPBOARD
|
||||
@@ -1406,7 +1374,7 @@ static struct vimoption options[] =
|
||||
(char_u *)&p_is, PV_NONE,
|
||||
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
|
||||
{"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM|P_MLE,
|
||||
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
|
||||
#if defined(FEAT_EVAL)
|
||||
(char_u *)&p_inde, PV_INDE,
|
||||
{(char_u *)"", (char_u *)0L}
|
||||
#else
|
||||
@@ -1415,7 +1383,7 @@ static struct vimoption options[] =
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
|
||||
#if defined(FEAT_EVAL)
|
||||
(char_u *)&p_indk, PV_INDK,
|
||||
{INDENTKEYS_DEFAULT, (char_u *)0L}
|
||||
#else
|
||||
@@ -1576,21 +1544,11 @@ static struct vimoption options[] =
|
||||
#endif
|
||||
SCTX_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} SCTX_INIT},
|
||||
{"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
||||
#ifdef FEAT_LISP
|
||||
(char_u *)&p_lispwords, PV_LW,
|
||||
{(char_u *)LISPWORD_VALUE, (char_u *)0L}
|
||||
#else
|
||||
(char_u *)NULL, PV_NONE,
|
||||
{(char_u *)"", (char_u *)0L}
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{(char_u *)LISPWORD_VALUE, (char_u *)0L} SCTX_INIT},
|
||||
{"list", NULL, P_BOOL|P_VI_DEF|P_RWIN,
|
||||
(char_u *)VAR_WIN, PV_LIST,
|
||||
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
|
||||
@@ -2342,11 +2300,7 @@ static struct vimoption options[] =
|
||||
(char_u *)&p_scs, PV_NONE,
|
||||
{(char_u *)FALSE, (char_u *)0L} SCTX_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} SCTX_INIT},
|
||||
{"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM,
|
||||
(char_u *)&p_sta, PV_NONE,
|
||||
|
||||
Reference in New Issue
Block a user