summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-09 09:14:13 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-09 09:14:13 +0000
commit7b88a0e32430c040a2a33a2aad5a20ef39e45399 (patch)
tree803d25679c141b01f391cc5ee2700ec390905177
parent76929293e03d4595c95171fc82be05a64673d42e (diff)
downloadvim-git-7b88a0e32430c040a2a33a2aad5a20ef39e45399.tar.gz
updated for version 7.1-212v7.1.212
-rw-r--r--src/edit.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index 138340767..4a9e1cf39 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 c41c2d286..7e1eaa1e9 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 */
/**/
+ 212,
+/**/
211,
/**/
210,