From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 8 Mar 2007 12:10:13 +0000 (+0000)
Subject: updated for version 7.0-211
X-Git-Tag: v7.0.211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9248e6e12e6042562d91d9ad2b81f5a0692889df;p=vim

updated for version 7.0-211
---

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
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    211,
 /**/
     210,
 /**/