summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-03-08 12:10:13 +0000
committerBram Moolenaar <Bram@vim.org>2007-03-08 12:10:13 +0000
commit9248e6e12e6042562d91d9ad2b81f5a0692889df (patch)
tree7790890e4e5a0568950fbe115c45dd132ae304c2
parent6cbce9d0dbee50dccf8173d0a94bebdd051c9330 (diff)
updated for version 7.0-211v7.0.211
-rw-r--r--src/edit.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index 25a76a2792..a4be291ef3 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8250,7 +8250,12 @@ ins_bs(c, mode, inserted_space_p)
#endif
mincol = 0;
/* keep indent */
- if (mode == BACKSPACE_LINE && curbuf->b_p_ai
+ if (mode == BACKSPACE_LINE
+ && (curbuf->b_p_ai
+#ifdef FEAT_CINDENT
+ || cindent_on()
+#endif
+ )
#ifdef FEAT_RIGHTLEFT
&& !revins_on
#endif
diff --git a/src/version.c b/src/version.c
index 3d7ce93052..af6f548cb2 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 */
/**/
+ 211,
+/**/
210,
/**/
209,