summaryrefslogtreecommitdiffstats
path: root/src/ex_cmds.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-30 13:34:23 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-30 13:34:23 +0100
commit0b105416066c95ade3604ec2139d8367d3c6e74e (patch)
tree00c20ce83fa5316d76e6df05b5755e3cbe5f156e /src/ex_cmds.c
parent76440e2efe9e3582e9943d01183ec8b2f3e4eb4b (diff)
updated for version 7.4.538v7.4.538
Problem: Tests fail with small features plus Python. Solution: Disallow weird combination of options. Do not set "fdm" when folding is disabled.
Diffstat (limited to 'src/ex_cmds.c')
-rw-r--r--src/ex_cmds.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 1114f85345..86dab4797d 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6200,9 +6200,11 @@ prepare_help_buffer()
(void)buf_init_chartab(curbuf, FALSE);
}
+#ifdef FEAT_FOLDING
/* Don't use the global foldmethod.*/
set_string_option_direct((char_u *)"fdm", -1, (char_u *)"manual",
OPT_FREE|OPT_LOCAL, 0);
+#endif
curbuf->b_p_ts = 8; /* 'tabstop' is 8 */
curwin->w_p_list = FALSE; /* no list mode */