updated for version 7.0-211

diff --git a/src/edit.c b/src/edit.c
index 25a76a2792fa682f4003f664e282136e2eb9bf16..a4be291ef3839ba76de8ec75c36a65f0a8450544 100644 (file)
--- 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 3d7ce930525921a7a59e584fb3b75af1ab1f46a6..af6f548cb2b76dda7550faf90b9c72c6726a2008 100644 (file)
--- 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,
 /**/