thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.1-261

Browse Source
This commit is contained in:
Bram Moolenaar 2008-02-20 17:15:26 +00:00
parent 9c33a7c971
commit ffd82c5307
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fileio.c
View File

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

BIN
src/testdir/test42.ok
View File

Binary file not shown.

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
261,
/**/ /**/
260, 260,
/**/ /**/