diff --git a/src/message.c b/src/message.c
index 3f6d56e..43e7e5e 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1861,7 +1861,7 @@
 	    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
index 21b9b01..2f9ecdc 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -860,6 +860,12 @@
 }
 #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 @@
 	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
index 2061ea0..0002ef8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2091,
+/**/
     2090,
 /**/
     2089,