diff --git a/src/version.c b/src/version.c index c14eac35bb..8ef229acb9 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 626, /**/ 625, /**/ diff --git a/src/vim.h b/src/vim.h index e35987951b..a7bb00170c 100644 --- a/src/vim.h +++ b/src/vim.h @@ -2044,6 +2044,20 @@ typedef int VimClipboard; /* This is required for the prototypes. */ #ifdef _MSC_VER /* Avoid useless warning "conversion from X to Y of greater size". */ #pragma warning(disable : 4312) +/* Avoid warning for old style function declarators */ + #pragma warning(disable : 4131) +/* Avoid warning for conversion to type with smaller range */ + #pragma warning(disable : 4244) +/* Avoid warning for conversion to larger size */ + #pragma warning(disable : 4306) +/* Avoid warning for unreferenced formal parameter */ + #pragma warning(disable : 4100) +/* Avoid warning for differs in indirection to slightly different base type */ + #pragma warning(disable : 4057) +/* Avoid warning for constant conditional expression */ + #pragma warning(disable : 4127) +/* Avoid warning for assignment within conditional */ + #pragma warning(disable : 4706) #endif /* Note: a NULL argument for vim_realloc() is not portable, don't use it. */