From dc32b7cf47511f40b7cc24ef56892e60e3c2d98f Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Fri, 9 Mar 2007 00:59:53 +0000
Subject: [PATCH] Patch 7.0.211 Problem:    With ":set cindent noai bs=0" using
 CTRL-U in Insert mode will             delete auto-indent.  After ":set ai"
 it doesn't. Solution:   Also check 'cindent' being set. (Ryan Lortie) Files: 
     src/edit.c

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/vim7@229 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/edit.c    | 7 ++++++-
 src/version.c | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/edit.c b/src/edit.c
index 25a76a27..a4be291e 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 3d7ce930..af6f548c 100644
--- 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,
-- 
2.11.4.GIT