updated for version 7.1-190

diff --git a/src/normal.c b/src/normal.c
index d1be629527c13d6f479bf6fde57cfe127a59f9d5..f5b76514b1591bc61330c41da2062e2fe03fc17c 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -6564,6 +6564,12 @@ nv_brace(cap)
        clearopbeep(cap->oap);
     else
     {
+       /* Don't leave the cursor on the NUL past a line */
+       if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
+       {
+           --curwin->w_cursor.col;
+           cap->oap->inclusive = TRUE;
+       }
 #ifdef FEAT_VIRTUALEDIT
        curwin->w_cursor.coladd = 0;
 #endif

diff --git a/src/version.c b/src/version.c
index 4459e5fce412e20a696c8a5fb6c3db3bd55dc524..9e3cff6385a6d4f483b6dfe2b8526300db4afaee 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 */
+/**/
+    190,
 /**/
     189,
 /**/