diff --git a/src/edit.c b/src/edit.c
index 138340767d..4a9e1cf399 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8452,6 +8452,7 @@ ins_bs(c, mode, inserted_space_p)
 	if (	   mode == BACKSPACE_CHAR
 		&& ((p_sta && in_indent)
 		    || (curbuf->b_p_sts != 0
+			&& curwin->w_cursor.col > 0
 			&& (*(ml_get_cursor() - 1) == TAB
 			    || (*(ml_get_cursor() - 1) == ' '
 				&& (!*inserted_space_p
diff --git a/src/version.c b/src/version.c
index c41c2d2863..7e1eaa1e90 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 */
+/**/
+    212,
 /**/
     211,
 /**/