summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 25a76a279..a4be291ef 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 3d7ce9305..af6f548cb 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,