From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 11 Nov 2008 20:57:11 +0000 (+0000)
Subject: updated for version 7.2-033
X-Git-Tag: v7.2.033
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=223a18948c8f3cb8e149c20c7bb8b112aa660b04;p=vim

updated for version 7.2-033
---

diff --git a/src/fileio.c b/src/fileio.c
index 67e8cfe43..3d473916b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5550,9 +5550,10 @@ check_for_bom(p, size, lenp, flags)
 	    name = "ucs-4le";	/* FF FE 00 00 */
 	    len = 4;
 	}
-	else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
+	else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
 	    name = "ucs-2le";	/* FF FE */
-	else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
+	else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
+	    /* utf-16le is preferred, it also works for ucs-2le text */
 	    name = "utf-16le";	/* FF FE */
     }
     else if (p[0] == 0xfe && p[1] == 0xff
diff --git a/src/testdir/test42.ok b/src/testdir/test42.ok
index 82b7c633c..d9b44948a 100644
Binary files a/src/testdir/test42.ok and b/src/testdir/test42.ok differ
diff --git a/src/version.c b/src/version.c
index e21e8e218..4fd09e259 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    33,
 /**/
     32,
 /**/