From ffd82c530766c02f76cbdd9db80adb853859e10b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Feb 2008 17:15:26 +0000
Subject: [PATCH] updated for version 7.1-261

---
 src/fileio.c          |   7 ++++---
 src/testdir/test42.ok | Bin 407 -> 310 bytes
 src/version.c         |   2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/fileio.c b/src/fileio.c
index 40905cfea..fbb3ada47 100644
--- 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
GIT binary patch
delta 15
WcmbQvyp3r>H)~0nuA$k){$&6v?**p-

delta 111
zcmdnSG@W@u_rwh>6DKT7`uCrqlp&d+m_e7ph=J?>KLjU-A(ep(2pND%7=VfxfXWzv
Y3K@V(85m4}7^ob(L=I3g6{G-!0e=`4S^xk5

diff --git a/src/version.c b/src/version.c
index 26bfaa2d7..fd5901449 100644
--- 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,
 /**/
-- 
2.50.1