updated for version 7.1-184

diff --git a/src/normal.c b/src/normal.c
index 0b19d537716b1e00e8a670dc13b54a178fcad440..d1be629527c13d6f479bf6fde57cfe127a59f9d5 100644 (file)
--- 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 36b2f94d5cf0ab1dc4b509e2ffd84e0ede915fc4..d4c093a8bb5203cb28bb780a6a814cb3af36e184 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    184,
 /**/
     183,
 /**/