commit 223a18948c8f3cb8e149c20c7bb8b112aa660b04
author Bram Moolenaar <Bram@vim.org> Tue Nov 11 20:57:11 2008 +0000
committer Bram Moolenaar <Bram@vim.org> Tue Nov 11 20:57:11 2008 +0000
tree 3fc4d7630364ace589f673eb471c0a82780027b6
parent 121932191b397859832c3585cb1a17a7c041ac01

updated for version 7.2-033

src/fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 67e8cfe..3d47391 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5550,9 +5550,10 @@
 	    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

src/testdir/test42.ok

diff --git a/src/testdir/test42.ok b/src/testdir/test42.ok
index 82b7c63..d9b4494 100644
--- a/src/testdir/test42.ok
+++ b/src/testdir/test42.ok
Binary files differ

src/version.c

diff --git a/src/version.c b/src/version.c
index e21e8e2..4fd09e2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    33,
+/**/
     32,
 /**/
     31,