From 49f6f3da49380935581f70d4c57eaa9a882e93f1 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Tue, 15 Jan 2008 10:04:22 +0000
Subject: [PATCH] Merged from the latest developing branch.

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

diff --git a/src/edit.c b/src/edit.c
index 60fd6525..4edd0bc0 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8618,6 +8618,14 @@ ins_bs(c, mode, inserted_space_p)
     if (vim_strchr(p_cpo, CPO_BACKSPACE) != NULL && dollar_vcol == 0)
 	dollar_vcol = curwin->w_virtcol;
 
+#ifdef FEAT_FOLDING
+    /* When deleting a char the cursor line must never be in a closed fold.
+     * E.g., when 'foldmethod' is indent and deleting the first non-white
+     * char before a Tab. */
+    if (did_backspace)
+	foldOpenCursor();
+#endif
+
     return did_backspace;
 }
 
diff --git a/src/version.c b/src/version.c
index 81265916..aea90257 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 */
 /**/
+    229,
+/**/
     228,
 /**/
     227,
-- 
2.11.4.GIT