updated for version 7.2-033

diff --git a/src/fileio.c b/src/fileio.c
index 67e8cfe43965f299cad199caadd330d3b77116cf..3d473916b24c1e4d4e92a27a4d067a418e867a6d 100644 (file)
--- 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 100644 (file)
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 e21e8e218eca7ecd365f9f452c172353834d4e78..4fd09e259494e2664e2ccbffb9f5da3a7ac8aebc 100644 (file)
--- 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,
 /**/