comparison src/ex_cmds.c @ 6415:3421b24e419c v7.4.538

updated for version 7.4.538 Problem: Tests fail with small features plus Python. Solution: Disallow weird combination of options. Do not set "fdm" when folding is disabled.
author Bram Moolenaar <bram@vim.org>
date Sun, 30 Nov 2014 13:34:23 +0100
parents 387e63680524
children f673842874b6
comparison
equal deleted inserted replaced
6414:af110084ec06 6415:3421b24e419c
6198 set_string_option_direct((char_u *)"isk", -1, p, OPT_FREE|OPT_LOCAL, 0); 6198 set_string_option_direct((char_u *)"isk", -1, p, OPT_FREE|OPT_LOCAL, 0);
6199 check_buf_options(curbuf); 6199 check_buf_options(curbuf);
6200 (void)buf_init_chartab(curbuf, FALSE); 6200 (void)buf_init_chartab(curbuf, FALSE);
6201 } 6201 }
6202 6202
6203 #ifdef FEAT_FOLDING
6203 /* Don't use the global foldmethod.*/ 6204 /* Don't use the global foldmethod.*/
6204 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"manual", 6205 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"manual",
6205 OPT_FREE|OPT_LOCAL, 0); 6206 OPT_FREE|OPT_LOCAL, 0);
6207 #endif
6206 6208
6207 curbuf->b_p_ts = 8; /* 'tabstop' is 8 */ 6209 curbuf->b_p_ts = 8; /* 'tabstop' is 8 */
6208 curwin->w_p_list = FALSE; /* no list mode */ 6210 curwin->w_p_list = FALSE; /* no list mode */
6209 6211
6210 curbuf->b_p_ma = FALSE; /* not modifiable */ 6212 curbuf->b_p_ma = FALSE; /* not modifiable */