summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-04 10:46:25 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-04 10:46:25 +0000
commit57fb0da2f942a525118e337eb1740c0c41c0efab (patch)
tree6569b82fe5328ab1df33a0cec34a1656ca52e02c
parent5b3e4600363922cb3b9c894e5f5b91e391437a3d (diff)
updated for version 7.2-095v7.2.095
-rw-r--r--src/normal.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index 0557833bae..30678a4269 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -6783,6 +6783,8 @@ nv_replace(cap)
/* Visual mode "r" */
if (VIsual_active)
{
+ if (got_int)
+ reset_VIsual();
nv_operator(cap);
return;
}
@@ -7839,7 +7841,7 @@ nv_g_cmd(cap)
else
i = curwin->w_leftcol;
/* Go to the middle of the screen line. When 'number' is on and lines
- * are wrapping the middle can be more to the left.*/
+ * are wrapping the middle can be more to the left. */
if (cap->nchar == 'm')
i += (W_WIDTH(curwin) - curwin_col_off()
+ ((curwin->w_p_wrap && i > 0)
diff --git a/src/version.c b/src/version.c
index ac0a911144..0f6cf0bf10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 95,
+/**/
94,
/**/
93,