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 3a7d846033c049a89d7f0952de45fa6b6e72aa26..fee7a0cfc091780d4e2bcea2db7bff61691d626e 100644 (file)
--- 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 1c7c9ddfad1de18c06241d3976e7da9bb34b0756..6684dfa014b87666771cdcf446eab41a1b5c9ae3 100644 (file)
--- 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,
 /**/