# HG changeset patch
# User vimboss
# Date 1226437031 0
# Node ID 35abb70264158760c724bd0290c6c441afec4fa0
# Parent  619b90abfdc95e3b1d0981a8995b942c6a7c3c29
updated for version 7.2-033

diff --git a/src/fileio.c b/src/fileio.c
--- 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 82b7c633cb6c18c914c3b069b800608f5324fe32..d9b44948a88cc1293fab073e33e897b478bd1096
GIT binary patch
literal 311
zc%0+nQcy_C%t=knOU_Tp%uBb;Ni50CGvvz4Ps-0t;`;Xw%-1#K;zCzgT9T$~0TcwQ
zgK#j^pc?jm_kOUthSZ`W?B*Go!3|6<)-}SVC?^#~8IX&q5GY}StjYw38dS4DT!f!t
R4(2+%{?P725cVOk>jCaTYB2x+

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    33,
+/**/
     32,
 /**/
     31,