updated for version 7.1-261

diff --git a/src/fileio.c b/src/fileio.c
index 40905cfea8792131ade7152a4783bedfef35c1dc..fbb3ada47d17da71e2dcc05ca80ba9aa30699f1c 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5514,10 +5514,11 @@ check_for_bom(p, size, lenp, flags)
     else if (p[0] == 0xfe && p[1] == 0xff
            && (flags == FIO_ALL || flags == FIO_UCS2 || flags == FIO_UTF16))
     {
-       if (flags == FIO_UTF16)
-           name = "utf-16";    /* FE FF */
-       else
+       /* Default to utf-16, it works also for ucs-2 text. */
+       if (flags == FIO_UCS2)
            name = "ucs-2";     /* FE FF */
+       else
+           name = "utf-16";    /* FE FF */
     }
     else if (size >= 4 && p[0] == 0 && p[1] == 0 && p[2] == 0xfe
            && p[3] == 0xff && (flags == FIO_ALL || flags == FIO_UCS4))

diff --git a/src/testdir/test42.ok b/src/testdir/test42.ok
index 16f41e46e0c9430df4c0672a13c3fb531b1e1ff7..643b75bc9690d2a3e0d1fe9782c30675919be962 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 26bfaa2d7b58e6232a27dc4b6247a7257f31cabf..fd5901449848ecec95f3ba32aa5d7a81fcc14f66 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    261,
 /**/
     260,
 /**/