summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-01-03 12:20:39 +0000
committervimboss <devnull@localhost>2008-01-03 12:20:39 +0000
commit581b1dcb3ad711a583dfa1bedd2d47aded740305 (patch)
tree50053e9a5cdc1716c8b1406254a70e476434052f
parentc1c993b889eccd8b061ab17ab0187ea7e547be98 (diff)
downloadvim-581b1dcb3ad711a583dfa1bedd2d47aded740305.tar.gz
updated for version 7.1-190v7.1.190v7-1-190
-rw-r--r--src/normal.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/normal.c b/src/normal.c
index d1be6295..f5b76514 100644
--- 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 4459e5fc..9e3cff63 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 */
/**/
+ 190,
+/**/
189,
/**/
188,