summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-04-12 12:26:36 +0200
committerBram Moolenaar <Bram@vim.org>2014-04-12 12:26:36 +0200
commit0eac828ab0199a639dd3657558fe9ed1411f43cd (patch)
treec207f3e102f6afa16f14a074f14f29d2f815e97e /src
parentb21a29be56fb0e125d9f736bfdef8dde5a1ceae0 (diff)
downloadvim-0eac828ab0199a639dd3657558fe9ed1411f43cd.zip
updated for version 7.4.257
Problem: Compiler warning, possibly for mismatch in parameter name. Solution: Rename the parameter in the declaration.
Diffstat (limited to 'src')
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index 3a7d84603..fee7a0cfc 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -113,7 +113,7 @@ static char_u *skip_comment __ARGS((char_u *line, int process, int include_space
#endif
static void block_prep __ARGS((oparg_T *oap, struct block_def *, linenr_T, int));
#if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL)
-static void str_to_reg __ARGS((struct yankreg *y_ptr, int type, char_u *str, long len, long blocklen, int str_list));
+static void str_to_reg __ARGS((struct yankreg *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list));
#endif
static int ends_in_white __ARGS((linenr_T lnum));
#ifdef FEAT_COMMENTS
diff --git a/src/version.c b/src/version.c
index 1c7c9ddfa..6684dfa01 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 257,
+/**/
256,
/**/
255,