commit 0b105416066c95ade3604ec2139d8367d3c6e74e
author Bram Moolenaar <Bram@vim.org> Sun Nov 30 13:34:23 2014 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Nov 30 13:34:23 2014 +0100
tree 00c20ce83fa5316d76e6df05b5755e3cbe5f156e
parent 76440e2efe9e3582e9943d01183ec8b2f3e4eb4b

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.

src/ex_cmds.c

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 1114f85..86dab47 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6200,9 +6200,11 @@
 	(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 */