From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 12 Apr 2014 10:26:36 +0000 (+0200)
Subject: updated for version 7.4.257
X-Git-Tag: v7.4.257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0eac828ab0199a639dd3657558fe9ed1411f43cd;p=vim

updated for version 7.4.257
Problem:    Compiler warning, possibly for mismatch in parameter name.
Solution:   Rename the parameter in the declaration.
---

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
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    257,
 /**/
     256,
 /**/