To: vim_dev@googlegroups.com Subject: Patch 8.2.2091 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2091 Problem: MS-Windows: build warnings. Solution: Add a #pragma to suppress the deprecation warning. (Ken Takata) Avoid using a non-ASCII character. (closes #7421) Files: src/message.c, src/os_win32.c *** ../vim-8.2.2090/src/message.c 2020-12-02 12:37:34.126954038 +0100 --- src/message.c 2020-12-04 19:37:03.364386715 +0100 *************** *** 1861,1867 **** col += (*mb_ptr2cells)(s); if (l >= MB_MAXBYTES) { ! STRCPY(buf, "¿"); } else if (lcs_nbsp != NUL && list && (mb_ptr2char(s) == 160 --- 1861,1867 ---- col += (*mb_ptr2cells)(s); if (l >= MB_MAXBYTES) { ! STRCPY(buf, "?"); } else if (lcs_nbsp != NUL && list && (mb_ptr2char(s) == 160 *** ../vim-8.2.2090/src/os_win32.c 2020-12-01 21:27:47.121151376 +0100 --- src/os_win32.c 2020-12-04 19:42:21.723363875 +0100 *************** *** 860,865 **** --- 860,871 ---- } #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,895 **** --- 896,904 ---- done = TRUE; } } + #ifdef _MSC_VER + # pragma warning(pop) + #endif #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) *** ../vim-8.2.2090/src/version.c 2020-12-04 19:11:53.881306962 +0100 --- src/version.c 2020-12-04 19:38:12.772163254 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2091, /**/ -- A hamburger walks into a bar, and the bartender says: "I'm sorry, but we don't serve food here." /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///