updated for version 7.0211
diff --git a/src/eval.c b/src/eval.c
index d1e2b19..71a8dc3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13412,8 +13412,8 @@
save_cursor = curwin->w_cursor;
pos = curwin->w_cursor;
- firstpos.lnum = 0;
- foundpos.lnum = 0;
+ clearpos(&firstpos);
+ clearpos(&foundpos);
pat = pat3;
for (;;)
{
@@ -15582,9 +15582,9 @@
typval_T *varp;
int lnum; /* TRUE when $ is last line */
{
- char_u *name;
+ char_u *name;
static pos_T pos;
- pos_T *pp;
+ pos_T *pp;
/* Argument can be [lnum, col]. */
if (varp->v_type == VAR_LIST)
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 9dcf0d5..74aaf4e 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -582,7 +582,7 @@
EX(CMD_marks, "marks", do_marks,
EXTRA|TRLBAR|CMDWIN),
EX(CMD_match, "match", ex_match,
- EXTRA|CMDWIN),
+ RANGE|NOTADR|EXTRA|CMDWIN),
EX(CMD_menu, "menu", ex_menu,
RANGE|NOTADR|ZEROR|BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_menutranslate, "menutranslate", ex_menutranslate,
diff --git a/src/menu.c b/src/menu.c
index 088c822..e30ac18 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2146,6 +2146,9 @@
curwin->w_cursor.col = 1;
tpos.lnum = eap->line2;
tpos.col = MAXCOL;
+#ifdef FEAT_VIRTUALEDIT
+ tpos.coladd = 0;
+#endif
}
/* Activate visual mode */
diff --git a/src/testdir/test58.in b/src/testdir/test58.in
index dacefd4..2c81ade 100644
--- a/src/testdir/test58.in
+++ b/src/testdir/test58.in
@@ -117,7 +117,7 @@
RAR ?
BAD !
-NOSPLITSUGS
+#NOSPLITSUGS
PFX I N 1
PFX I 0 in .
@@ -183,7 +183,7 @@
RAR ?
BAD !
-NOSPLITSUGS
+#NOSPLITSUGS
PFX I N 1
PFX I 0 in .
@@ -340,7 +340,7 @@
RAR ?
BAD !
-NOSPLITSUGS
+#NOSPLITSUGS
PFX I N 1
PFX I 0 in .