Mercurial > vim

diff src/fileio.c @ 1547:e72e30c69d58 v7.1.261

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-261
author vimboss
date Wed, 20 Feb 2008 17:15:26 +0000
parents 1f93fbcb4e0c
children 2c4ca49319a6
line wrap: on
line diff
--- 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)
+	/* 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
-	    name = "ucs-2";	/* FE FF */
     }
     else if (size >= 4 && p[0] == 0 && p[1] == 0 && p[2] == 0xfe
 	    && p[3] == 0xff && (flags == FIO_ALL || flags == FIO_UCS4))