# HG changeset patch
# User vimboss
# Date 1173355813 0
# Node ID f299f0bf32d76986d5596d279bc0733cebe1942b
# Parent  bf63a31b77017d78197bc0155c0ec59e31559df3
updated for version 7.0-211

diff --git a/src/edit.c b/src/edit.c
--- 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
--- 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,