Fix merge

Author: splhack

src/ex_cmds.h

@@ -871,9 +871,11 @@ EX(CMD_match,		"match",	ex_match,
 			RANGE|NOTADR|EXTRA|CMDWIN,
 			ADDR_LINES),
 EX(CMD_macaction,	"macaction",	ex_macaction,
-			EXTRA|NOSPC|NEEDARG),
+			EXTRA|NOSPC|NEEDARG,
+			ADDR_LINES),
 EX(CMD_macmenu,		"macmenu",	ex_macmenu,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_menu,		"menu",		ex_menu,
 			RANGE|NOTADR|ZEROR|BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
 			ADDR_LINES),