diff --git a/src/fileio.c b/src/fileio.c index 67e8cfe439..3d473916b2 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 82b7c633cb..d9b44948a8 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 e21e8e218e..4fd09e2594 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, /**/