Merge remote-tracking branch 'vim/master'

Author: splhack

src/os_mswin.c

@@ -2703,8 +2703,8 @@ quality_pairs[] = {
 #ifdef ANTIALIASED_QUALITY
     {"ANTIALIASED",	ANTIALIASED_QUALITY},
 #endif
-#ifdef NOANTIALIASED_QUALITY
-    {"NOANTIALIASED",	NOANTIALIASED_QUALITY},
+#ifdef NONANTIALIASED_QUALITY
+    {"NONANTIALIASED",	NONANTIALIASED_QUALITY},
 #endif
 #ifdef PROOF_QUALITY
     {"PROOF",		PROOF_QUALITY},

src/version.c

@@ -768,6 +768,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1830,
 /**/
     1829,
 /**/