diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-11-11 20:57:11 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-11-11 20:57:11 +0000 |
| commit | 223a18948c8f3cb8e149c20c7bb8b112aa660b04 (patch) | |
| tree | 3fc4d7630364ace589f673eb471c0a82780027b6 | |
| parent | 121932191b397859832c3585cb1a17a7c041ac01 (diff) | |
updated for version 7.2-033v7.2.033
| -rw-r--r-- | src/fileio.c | 5 | ||||
| -rw-r--r-- | src/testdir/test42.ok | bin | 408 -> 311 bytes | |||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
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 Binary files differindex 82b7c633cb..d9b44948a8 100644 --- a/src/testdir/test42.ok +++ b/src/testdir/test42.ok diff --git a/src/version.c b/src/version.c index e21e8e218e..4fd09e2594 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 33, +/**/ 32, /**/ 31, |