Mercurial > vim

comparison src/optionstr.c @ 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 b93668df9160
children be6c32395444
comparison
equal deleted inserted replaced
28941:f17de8647585 28942:6cdf55afaae9
213 check_string_option(&buf->b_p_inc); 213 check_string_option(&buf->b_p_inc);
214 # ifdef FEAT_EVAL 214 # ifdef FEAT_EVAL
215 check_string_option(&buf->b_p_inex); 215 check_string_option(&buf->b_p_inex);
216 # endif 216 # endif
217 #endif 217 #endif
218 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 218 #if defined(FEAT_EVAL)
219 check_string_option(&buf->b_p_inde); 219 check_string_option(&buf->b_p_inde);
220 check_string_option(&buf->b_p_indk); 220 check_string_option(&buf->b_p_indk);
221 #endif 221 #endif
222 #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) 222 #if defined(FEAT_BEVAL) && defined(FEAT_EVAL)
223 check_string_option(&buf->b_p_bexpr); 223 check_string_option(&buf->b_p_bexpr);
256 check_string_option(&buf->b_s.b_p_spo); 256 check_string_option(&buf->b_s.b_p_spo);
257 #endif 257 #endif
258 #ifdef FEAT_SEARCHPATH 258 #ifdef FEAT_SEARCHPATH
259 check_string_option(&buf->b_p_sua); 259 check_string_option(&buf->b_p_sua);
260 #endif 260 #endif
261 #ifdef FEAT_CINDENT
262 check_string_option(&buf->b_p_cink); 261 check_string_option(&buf->b_p_cink);
263 check_string_option(&buf->b_p_cino); 262 check_string_option(&buf->b_p_cino);
264 check_string_option(&buf->b_p_cinsd); 263 check_string_option(&buf->b_p_cinsd);
265 parse_cino(buf); 264 parse_cino(buf);
266 #endif
267 check_string_option(&buf->b_p_ft); 265 check_string_option(&buf->b_p_ft);
268 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
269 check_string_option(&buf->b_p_cinw); 266 check_string_option(&buf->b_p_cinw);
270 #endif
271 check_string_option(&buf->b_p_cpt); 267 check_string_option(&buf->b_p_cpt);
272 #ifdef FEAT_COMPL_FUNC 268 #ifdef FEAT_COMPL_FUNC
273 check_string_option(&buf->b_p_cfu); 269 check_string_option(&buf->b_p_cfu);
274 check_string_option(&buf->b_p_ofu); 270 check_string_option(&buf->b_p_ofu);
275 check_string_option(&buf->b_p_tsrfu); 271 check_string_option(&buf->b_p_tsrfu);
289 check_string_option(&buf->b_p_path); 285 check_string_option(&buf->b_p_path);
290 check_string_option(&buf->b_p_tags); 286 check_string_option(&buf->b_p_tags);
291 check_string_option(&buf->b_p_tc); 287 check_string_option(&buf->b_p_tc);
292 check_string_option(&buf->b_p_dict); 288 check_string_option(&buf->b_p_dict);
293 check_string_option(&buf->b_p_tsr); 289 check_string_option(&buf->b_p_tsr);
294 #ifdef FEAT_LISP
295 check_string_option(&buf->b_p_lw); 290 check_string_option(&buf->b_p_lw);
296 #endif
297 check_string_option(&buf->b_p_bkc); 291 check_string_option(&buf->b_p_bkc);
298 check_string_option(&buf->b_p_menc); 292 check_string_option(&buf->b_p_menc);
299 #ifdef FEAT_VARTABS 293 #ifdef FEAT_VARTABS
300 check_string_option(&buf->b_p_vsts); 294 check_string_option(&buf->b_p_vsts);
301 check_string_option(&buf->b_p_vts); 295 check_string_option(&buf->b_p_vts);
2114 } 2108 }
2115 } 2109 }
2116 } 2110 }
2117 #endif 2111 #endif
2118 2112
2119 #ifdef FEAT_CINDENT
2120 // 'cinoptions' 2113 // 'cinoptions'
2121 else if (gvarp == &p_cino) 2114 else if (gvarp == &p_cino)
2122 { 2115 {
2123 // TODO: recognize errors 2116 // TODO: recognize errors
2124 parse_cino(curbuf); 2117 parse_cino(curbuf);
2125 } 2118 }
2126 #endif
2127 2119
2128 #if defined(FEAT_RENDER_OPTIONS) 2120 #if defined(FEAT_RENDER_OPTIONS)
2129 // 'renderoptions' 2121 // 'renderoptions'
2130 else if (varp == &p_rop) 2122 else if (varp == &p_rop)
2131 { 2123 {
2313 # endif 2305 # endif
2314 gvarp == &p_fex || 2306 gvarp == &p_fex ||
2315 # ifdef FEAT_FIND_ID 2307 # ifdef FEAT_FIND_ID
2316 gvarp == &p_inex || 2308 gvarp == &p_inex ||
2317 # endif 2309 # endif
2318 # ifdef FEAT_CINDENT
2319 gvarp == &p_inde || 2310 gvarp == &p_inde ||
2320 # endif
2321 # ifdef FEAT_DIFF 2311 # ifdef FEAT_DIFF
2322 varp == &p_pex || 2312 varp == &p_pex ||
2323 # endif 2313 # endif
2324 # ifdef FEAT_POSTSCRIPT 2314 # ifdef FEAT_POSTSCRIPT
2325 varp == &p_pexpr || 2315 varp == &p_pexpr ||
2349 p_opt = &curbuf->b_p_fex; 2339 p_opt = &curbuf->b_p_fex;
2350 # ifdef FEAT_FIND_ID 2340 # ifdef FEAT_FIND_ID
2351 if (gvarp == &p_inex) // 'includeexpr' 2341 if (gvarp == &p_inex) // 'includeexpr'
2352 p_opt = &curbuf->b_p_inex; 2342 p_opt = &curbuf->b_p_inex;
2353 # endif 2343 # endif
2354 # ifdef FEAT_CINDENT
2355 if (gvarp == &p_inde) // 'indentexpr' 2344 if (gvarp == &p_inde) // 'indentexpr'
2356 p_opt = &curbuf->b_p_inde; 2345 p_opt = &curbuf->b_p_inde;
2357 # endif
2358 # ifdef FEAT_DIFF 2346 # ifdef FEAT_DIFF
2359 if (varp == &p_pex) // 'patchexpr' 2347 if (varp == &p_pex) // 'patchexpr'
2360 p_opt = &p_pex; 2348 p_opt = &p_pex;
2361 # endif 2349 # endif
2362 # ifdef FEAT_POSTSCRIPT 2350 # ifdef FEAT_POSTSCRIPT