summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-02 15:26:04 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-02 15:26:04 +0000
commitad8958b1889835804c7bccb87603634bd87ac5df (patch)
tree1ff3139cfd03c6d5045db481bd05df5690ec2eae
parentd42107724b28d1cc9fe0b593ac4e8095238558a2 (diff)
downloadvim-git-7.1.184.tar.gz
updated for version 7.1-184v7.1.184
-rw-r--r--src/normal.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c
index 0b19d5377..d1be62952 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5849,12 +5849,13 @@ nv_left(cap)
/* When the NL before the first char has to be deleted we
* put the cursor on the NUL after the previous line.
* This is a very special case, be careful!
- * don't adjust op_end now, otherwise it won't work */
+ * Don't adjust op_end now, otherwise it won't work. */
if ( (cap->oap->op_type == OP_DELETE
|| cap->oap->op_type == OP_CHANGE)
&& !lineempty(curwin->w_cursor.lnum))
{
- ++curwin->w_cursor.col;
+ if (*ml_get_cursor() != NUL)
+ ++curwin->w_cursor.col;
cap->retval |= CA_NO_ADJ_OP_END;
}
continue;
diff --git a/src/version.c b/src/version.c
index 36b2f94d5..d4c093a8b 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 */
/**/
+ 184,
+/**/
183,
/**/
182,