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

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 d0241e74bfdb
children 9dce192d1ac2
comparison
equal deleted inserted replaced
28941:f17de8647585 28942:6cdf55afaae9
396 #endif 396 #endif
397 EXTERN int p_ai; // 'autoindent' 397 EXTERN int p_ai; // 'autoindent'
398 EXTERN int p_bin; // 'binary' 398 EXTERN int p_bin; // 'binary'
399 EXTERN int p_bomb; // 'bomb' 399 EXTERN int p_bomb; // 'bomb'
400 EXTERN int p_bl; // 'buflisted' 400 EXTERN int p_bl; // 'buflisted'
401 #ifdef FEAT_CINDENT
402 EXTERN int p_cin; // 'cindent' 401 EXTERN int p_cin; // 'cindent'
403 EXTERN char_u *p_cink; // 'cinkeys' 402 EXTERN char_u *p_cink; // 'cinkeys'
404 EXTERN char_u *p_cinsd; // 'cinscopedecls' 403 EXTERN char_u *p_cinsd; // 'cinscopedecls'
405 #endif
406 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
407 EXTERN char_u *p_cinw; // 'cinwords' 404 EXTERN char_u *p_cinw; // 'cinwords'
408 #endif
409 #ifdef FEAT_COMPL_FUNC 405 #ifdef FEAT_COMPL_FUNC
410 EXTERN char_u *p_cfu; // 'completefunc' 406 EXTERN char_u *p_cfu; // 'completefunc'
411 EXTERN char_u *p_ofu; // 'omnifunc' 407 EXTERN char_u *p_ofu; // 'omnifunc'
412 EXTERN char_u *p_tsrfu; // 'thesaurusfunc' 408 EXTERN char_u *p_tsrfu; // 'thesaurusfunc'
413 #endif 409 #endif
489 EXTERN int p_deco; // 'delcombine' 485 EXTERN int p_deco; // 'delcombine'
490 #ifdef FEAT_EVAL 486 #ifdef FEAT_EVAL
491 EXTERN char_u *p_ccv; // 'charconvert' 487 EXTERN char_u *p_ccv; // 'charconvert'
492 #endif 488 #endif
493 EXTERN int p_cdh; // 'cdhome' 489 EXTERN int p_cdh; // 'cdhome'
494 #ifdef FEAT_CINDENT
495 EXTERN char_u *p_cino; // 'cinoptions' 490 EXTERN char_u *p_cino; // 'cinoptions'
496 #endif
497 #ifdef FEAT_CMDWIN 491 #ifdef FEAT_CMDWIN
498 EXTERN char_u *p_cedit; // 'cedit' 492 EXTERN char_u *p_cedit; // 'cedit'
499 EXTERN long p_cwh; // 'cmdwinheight' 493 EXTERN long p_cwh; // 'cmdwinheight'
500 #endif 494 #endif
501 #ifdef FEAT_CLIPBOARD 495 #ifdef FEAT_CLIPBOARD
686 EXTERN int p_inf; // 'infercase' 680 EXTERN int p_inf; // 'infercase'
687 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) 681 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
688 EXTERN char_u *p_inex; // 'includeexpr' 682 EXTERN char_u *p_inex; // 'includeexpr'
689 #endif 683 #endif
690 EXTERN int p_is; // 'incsearch' 684 EXTERN int p_is; // 'incsearch'
691 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 685 #if defined(FEAT_EVAL)
692 EXTERN char_u *p_inde; // 'indentexpr' 686 EXTERN char_u *p_inde; // 'indentexpr'
693 EXTERN char_u *p_indk; // 'indentkeys' 687 EXTERN char_u *p_indk; // 'indentkeys'
694 #endif 688 #endif
695 EXTERN int p_im; // 'insertmode' 689 EXTERN int p_im; // 'insertmode'
696 EXTERN char_u *p_isf; // 'isfname' 690 EXTERN char_u *p_isf; // 'isfname'
715 EXTERN char_u *p_lm; // 'langmenu' 709 EXTERN char_u *p_lm; // 'langmenu'
716 #endif 710 #endif
717 #ifdef FEAT_GUI 711 #ifdef FEAT_GUI
718 EXTERN long p_linespace; // 'linespace' 712 EXTERN long p_linespace; // 'linespace'
719 #endif 713 #endif
720 #ifdef FEAT_LISP
721 EXTERN int p_lisp; // 'lisp' 714 EXTERN int p_lisp; // 'lisp'
722 EXTERN char_u *p_lispwords; // 'lispwords' 715 EXTERN char_u *p_lispwords; // 'lispwords'
723 #endif
724 EXTERN long p_ls; // 'laststatus' 716 EXTERN long p_ls; // 'laststatus'
725 EXTERN long p_stal; // 'showtabline' 717 EXTERN long p_stal; // 'showtabline'
726 EXTERN char_u *p_lcs; // 'listchars' 718 EXTERN char_u *p_lcs; // 'listchars'
727 719
728 EXTERN int p_lz; // 'lazyredraw' 720 EXTERN int p_lz; // 'lazyredraw'
912 EXTERN int p_sm; // 'showmatch' 904 EXTERN int p_sm; // 'showmatch'
913 EXTERN int p_smd; // 'showmode' 905 EXTERN int p_smd; // 'showmode'
914 EXTERN long p_ss; // 'sidescroll' 906 EXTERN long p_ss; // 'sidescroll'
915 EXTERN long p_siso; // 'sidescrolloff' 907 EXTERN long p_siso; // 'sidescrolloff'
916 EXTERN int p_scs; // 'smartcase' 908 EXTERN int p_scs; // 'smartcase'
917 #ifdef FEAT_SMARTINDENT
918 EXTERN int p_si; // 'smartindent' 909 EXTERN int p_si; // 'smartindent'
919 #endif
920 EXTERN int p_sta; // 'smarttab' 910 EXTERN int p_sta; // 'smarttab'
921 EXTERN long p_sts; // 'softtabstop' 911 EXTERN long p_sts; // 'softtabstop'
922 EXTERN int p_sb; // 'splitbelow' 912 EXTERN int p_sb; // 'splitbelow'
923 #if defined(FEAT_SEARCHPATH) 913 #if defined(FEAT_SEARCHPATH)
924 EXTERN char_u *p_sua; // 'suffixesadd' 914 EXTERN char_u *p_sua; // 'suffixesadd'
1123 #endif 1113 #endif
1124 , BV_BIN 1114 , BV_BIN
1125 , BV_BL 1115 , BV_BL
1126 , BV_BOMB 1116 , BV_BOMB
1127 , BV_CI 1117 , BV_CI
1128 #ifdef FEAT_CINDENT
1129 , BV_CIN 1118 , BV_CIN
1130 , BV_CINK 1119 , BV_CINK
1131 , BV_CINO 1120 , BV_CINO
1132 , BV_CINSD 1121 , BV_CINSD
1133 #endif
1134 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
1135 , BV_CINW 1122 , BV_CINW
1136 #endif
1137 , BV_CM 1123 , BV_CM
1138 #ifdef FEAT_FOLDING 1124 #ifdef FEAT_FOLDING
1139 , BV_CMS 1125 , BV_CMS
1140 #endif 1126 #endif
1141 , BV_COM 1127 , BV_COM
1166 , BV_FLP 1152 , BV_FLP
1167 , BV_FO 1153 , BV_FO
1168 , BV_FT 1154 , BV_FT
1169 , BV_IMI 1155 , BV_IMI
1170 , BV_IMS 1156 , BV_IMS
1171 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 1157 #if defined(FEAT_EVAL)
1172 , BV_INDE 1158 , BV_INDE
1173 , BV_INDK 1159 , BV_INDK
1174 #endif 1160 #endif
1175 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) 1161 #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
1176 , BV_INEX 1162 , BV_INEX
1182 #endif 1168 #endif
1183 #ifdef FEAT_KEYMAP 1169 #ifdef FEAT_KEYMAP
1184 , BV_KMAP 1170 , BV_KMAP
1185 #endif 1171 #endif
1186 , BV_KP 1172 , BV_KP
1187 #ifdef FEAT_LISP
1188 , BV_LISP 1173 , BV_LISP
1189 , BV_LW 1174 , BV_LW
1190 #endif
1191 , BV_MENC 1175 , BV_MENC
1192 , BV_MA 1176 , BV_MA
1193 , BV_ML 1177 , BV_ML
1194 , BV_MOD 1178 , BV_MOD
1195 , BV_MPS 1179 , BV_MPS
1201 , BV_PI 1185 , BV_PI
1202 #ifdef FEAT_TEXTOBJ 1186 #ifdef FEAT_TEXTOBJ
1203 , BV_QE 1187 , BV_QE
1204 #endif 1188 #endif
1205 , BV_RO 1189 , BV_RO
1206 #ifdef FEAT_SMARTINDENT
1207 , BV_SI 1190 , BV_SI
1208 #endif
1209 , BV_SN 1191 , BV_SN
1210 #ifdef FEAT_SYN_HL 1192 #ifdef FEAT_SYN_HL
1211 , BV_SMC 1193 , BV_SMC
1212 , BV_SYN 1194 , BV_SYN
1213 #endif 1195 #endif