# HG changeset patch # User Bram Moolenaar # Date 1607107503 -3600 # Node ID fb27d3a7a24bc18a77afd24945d91592cace17c0 # Parent beedb1cba6dd4a583ad2a43b5be649186cc78546 patch 8.2.2091: MS-Windows: build warnings Commit: https://github.com/vim/vim/commit/29d2f45c8855fd98897c5db92d896c161e95d0f1 Author: Bram Moolenaar Date: Fri Dec 4 19:42:52 2020 +0100 patch 8.2.2091: MS-Windows: build warnings Problem: MS-Windows: build warnings. Solution: Add a #pragma to suppress the deprecation warning. (Ken Takata) Avoid using a non-ASCII character. (closes #7421) diff --git a/src/message.c b/src/message.c --- a/src/message.c +++ b/src/message.c @@ -1861,7 +1861,7 @@ msg_prt_line(char_u *s, int list) col += (*mb_ptr2cells)(s); if (l >= MB_MAXBYTES) { - STRCPY(buf, "¿"); + STRCPY(buf, "?"); } else if (lcs_nbsp != NUL && list && (mb_ptr2char(s) == 160 diff --git a/src/os_win32.c b/src/os_win32.c --- a/src/os_win32.c +++ b/src/os_win32.c @@ -860,6 +860,12 @@ win32_enable_privilege(LPTSTR lpszPrivil } #endif +#ifdef _MSC_VER +// Suppress the deprecation warning for using GetVersionEx(). +// It is needed for implementing "windowsversion()". +# pragma warning(push) +# pragma warning(disable: 4996) +#endif /* * Set "win8_or_later" and fill in "windowsVersion" if possible. */ @@ -890,6 +896,9 @@ PlatformId(void) done = TRUE; } } +#ifdef _MSC_VER +# pragma warning(pop) +#endif #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2091, +/**/ 2090, /**/ 2089,