summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-05-13 12:37:50 +0000
committerBram Moolenaar <Bram@vim.org>2006-05-13 12:37:50 +0000
commit2e97890d67d0db2021eb9e79ee81c713e8b3532a (patch)
tree8e24304b02e06b8825720fbc58028e5f8104c47a
parentc9a99918bd0e5de15ed12b9b73cb1458f5fed64f (diff)
downloadvim-git-2e97890d67d0db2021eb9e79ee81c713e8b3532a.tar.gz
updated for version 7.0-011v7.0.011
-rw-r--r--src/option.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index d2b6335cc..bd1991614 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5227,13 +5227,13 @@ insecure_flag(opt_idx, opt_flags)
case PV_STL: return &curwin->w_p_stl_flags;
#endif
#ifdef FEAT_EVAL
+# ifdef FEAT_FOLDING
case PV_FDE: return &curwin->w_p_fde_flags;
case PV_FDT: return &curwin->w_p_fdt_flags;
+# endif
# ifdef FEAT_BEVAL
case PV_BEXPR: return &curbuf->b_p_bexpr_flags;
# endif
-#endif
-#if defined(FEAT_EVAL)
# if defined(FEAT_CINDENT)
case PV_INDE: return &curbuf->b_p_inde_flags;
# endif
diff --git a/src/version.c b/src/version.c
index 74dfd8bc4..ff1671f08 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 11,
+/**/
10,
/**/
9,