--- src/edit.c	2005-04-08 05:16:31.000000000 -0400
+++ src/edit.c	2006-05-16 03:13:50.000000000 -0400
@@ -6521,7 +6521,11 @@ 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