]>
Commit | Line | Data |
---|---|---|
ef75664d AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.261 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.261 | |
11 | Problem: When a 2 byte BOM is detected Vim uses UCS-2, which doesn't work | |
12 | for UTF-16 text. (Tony Mechelynck) | |
13 | Solution: Default to UTF-16. | |
14 | Files: src/fileio.c, src/testdir/test42.ok | |
15 | ||
16 | ||
17 | *** ../vim-7.1.260/src/fileio.c Fri Jan 4 16:30:40 2008 | |
18 | --- src/fileio.c Wed Feb 20 11:22:10 2008 | |
19 | *************** | |
20 | *** 5514,5523 **** | |
21 | else if (p[0] == 0xfe && p[1] == 0xff | |
22 | && (flags == FIO_ALL || flags == FIO_UCS2 || flags == FIO_UTF16)) | |
23 | { | |
24 | ! if (flags == FIO_UTF16) | |
25 | ! name = "utf-16"; /* FE FF */ | |
26 | ! else | |
27 | name = "ucs-2"; /* FE FF */ | |
28 | } | |
29 | else if (size >= 4 && p[0] == 0 && p[1] == 0 && p[2] == 0xfe | |
30 | && p[3] == 0xff && (flags == FIO_ALL || flags == FIO_UCS4)) | |
31 | --- 5523,5533 ---- | |
32 | else if (p[0] == 0xfe && p[1] == 0xff | |
33 | && (flags == FIO_ALL || flags == FIO_UCS2 || flags == FIO_UTF16)) | |
34 | { | |
35 | ! /* Default to utf-16, it works also for ucs-2 text. */ | |
36 | ! if (flags == FIO_UCS2) | |
37 | name = "ucs-2"; /* FE FF */ | |
38 | + else | |
39 | + name = "utf-16"; /* FE FF */ | |
40 | } | |
41 | else if (size >= 4 && p[0] == 0 && p[1] == 0 && p[2] == 0xfe | |
42 | && p[3] == 0xff && (flags == FIO_ALL || flags == FIO_UCS4)) | |
43 | *** ../vim-7.1.260/src/testdir/test42.ok Sun Jun 13 21:02:32 2004 | |
44 | --- src/testdir/test42.ok Wed Feb 20 13:27:37 2008 | |
45 | *************** | |
46 | *** 15,21 **** | |
47 |