aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-28 09:27:14 -04:00
Code Activity

patch 8.2.4993: smart/C/lisp indenting is optional

Browse Source 
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
2022-05-21 20:17:31 +01:00
parent 5a01caa904
commit 8e145b8246
27 changed files with 80 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/option.h
View File

@@ -398,14 +398,10 @@ EXTERN int p_ai; // 'autoindent'
EXTERN int p_bin; // 'binary'
EXTERN int p_bomb; // 'bomb'
EXTERN int p_bl; // 'buflisted'
#ifdef FEAT_CINDENT
EXTERN int p_cin; // 'cindent'
EXTERN char_u *p_cink; // 'cinkeys'
EXTERN char_u *p_cinsd; // 'cinscopedecls'
#endif
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
EXTERN char_u *p_cinw; // 'cinwords'
#endif
#ifdef FEAT_COMPL_FUNC
EXTERN char_u *p_cfu; // 'completefunc'
EXTERN char_u *p_ofu; // 'omnifunc'
@@ -491,9 +487,7 @@ EXTERN int p_deco; // 'delcombine'
EXTERN char_u *p_ccv; // 'charconvert'
#endif
EXTERN int p_cdh; // 'cdhome'
#ifdef FEAT_CINDENT
EXTERN char_u *p_cino; // 'cinoptions'
#endif
#ifdef FEAT_CMDWIN
EXTERN char_u *p_cedit; // 'cedit'
EXTERN long p_cwh; // 'cmdwinheight'
@@ -688,7 +682,7 @@ EXTERN int p_inf; // 'infercase'
EXTERN char_u *p_inex; // 'includeexpr'
#endif
EXTERN int p_is; // 'incsearch'
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
#if defined(FEAT_EVAL)
EXTERN char_u *p_inde; // 'indentexpr'
EXTERN char_u *p_indk; // 'indentkeys'
#endif
@@ -717,10 +711,8 @@ EXTERN char_u *p_lm; // 'langmenu'
#ifdef FEAT_GUI
EXTERN long p_linespace; // 'linespace'
#endif
#ifdef FEAT_LISP
EXTERN int p_lisp; // 'lisp'
EXTERN char_u *p_lispwords; // 'lispwords'
#endif
EXTERN long p_ls; // 'laststatus'
EXTERN long p_stal; // 'showtabline'
EXTERN char_u *p_lcs; // 'listchars'
@@ -914,9 +906,7 @@ EXTERN int p_smd; // 'showmode'
EXTERN long p_ss; // 'sidescroll'
EXTERN long p_siso; // 'sidescrolloff'
EXTERN int p_scs; // 'smartcase'
#ifdef FEAT_SMARTINDENT
EXTERN int p_si; // 'smartindent'
#endif
EXTERN int p_sta; // 'smarttab'
EXTERN long p_sts; // 'softtabstop'
EXTERN int p_sb; // 'splitbelow'
@@ -1125,15 +1115,11 @@ enum
, BV_BL
, BV_BOMB
, BV_CI
#ifdef FEAT_CINDENT
, BV_CIN
, BV_CINK
, BV_CINO
, BV_CINSD
#endif
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
, BV_CINW
#endif
, BV_CM
#ifdef FEAT_FOLDING
, BV_CMS
@@ -1168,7 +1154,7 @@ enum
, BV_FT
, BV_IMI
, BV_IMS
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
#if defined(FEAT_EVAL)
, BV_INDE
, BV_INDK
#endif
@@ -1184,10 +1170,8 @@ enum
, BV_KMAP
#endif
, BV_KP
#ifdef FEAT_LISP
, BV_LISP
, BV_LW
#endif
, BV_MENC
, BV_MA
, BV_ML
@@ -1203,9 +1187,7 @@ enum
, BV_QE
#endif
, BV_RO
#ifdef FEAT_SMARTINDENT
, BV_SI
#endif
, BV_SN
#ifdef FEAT_SYN_HL
, BV_SMC