summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-07-27 19:33:14 +0000
committervimboss <devnull@localhost>2007-07-27 19:33:14 +0000
commit715b5475e2326ec7934973fd2a39df8ff03d88bb (patch)
treef0fa8af17b03284903214ace851ebe3024a71a4c
parentd2b7cc20e03c14a014923e22e3aee067da514b89 (diff)
downloadvim-715b5475e2326ec7934973fd2a39df8ff03d88bb.tar.gz
updated for version 7.1-042v7.1.042v7-1-042
-rw-r--r--src/eval.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c
index 10df05b4..1b267473 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7108,7 +7108,7 @@ static struct fst
{"getftype", 1, 1, f_getftype},
{"getline", 1, 2, f_getline},
{"getloclist", 1, 1, f_getqflist},
- {"getmatches", 0, 0, f_getmatches},
+ {"getmatches", 0, 0, f_getmatches},
{"getpos", 1, 1, f_getpos},
{"getqflist", 0, 0, f_getqflist},
{"getreg", 0, 2, f_getreg},
@@ -12526,9 +12526,11 @@ f_matchadd(argvars, rettv)
if (grp == NULL || pat == NULL)
return;
if (argvars[2].v_type != VAR_UNKNOWN)
+ {
prio = get_tv_number_chk(&argvars[2], &error);
- if (argvars[3].v_type != VAR_UNKNOWN)
- id = get_tv_number_chk(&argvars[3], &error);
+ if (argvars[3].v_type != VAR_UNKNOWN)
+ id = get_tv_number_chk(&argvars[3], &error);
+ }
if (error == TRUE)
return;
if (id >= 1 && id <= 3)
diff --git a/src/version.c b/src/version.c
index c243d173..92b1cb61 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 */
/**/
+ 42,
+/**/
41,
/**/
40,