summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-12-17 14:47:56 +0100
committerBram Moolenaar <Bram@vim.org>2014-12-17 14:47:56 +0100
commit140e995ed530770408a49f69f61d68f95b07e327 (patch)
tree8d2d3b698f7d7aab63732fe075a8e1bcea7998b0 /src
parentae38d05271f9f25b6ad39b10e5f41d9656a7f1ab (diff)
downloadvim-140e995ed530770408a49f69f61d68f95b07e327.zip
updated for version 7.4.557
Problem: One more small issue. Solution: Update function proto.
Diffstat (limited to 'src')
-rw-r--r--src/proto/window.pro2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/proto/window.pro b/src/proto/window.pro
index 2d33c1757..b89cf085a 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -75,7 +75,7 @@ void restore_win __ARGS((win_T *save_curwin, tabpage_T *save_curtab, int no_disp
void switch_buffer __ARGS((buf_T **save_curbuf, buf_T *buf));
void restore_buffer __ARGS((buf_T *save_curbuf));
int win_hasvertsplit __ARGS((void));
-int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos));
+int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos_list));
int match_delete __ARGS((win_T *wp, int id, int perr));
void clear_matches __ARGS((win_T *wp));
matchitem_T *get_match __ARGS((win_T *wp, int id));
diff --git a/src/version.c b/src/version.c
index 017bff6d5..514193a93 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 557,
+/**/
556,
/**/
555,