|
 |
6dab6f3 |
To: vim-dev@vim.org
|
|
|
6dab6f3 |
Subject: Patch 7.2.033
|
|
|
6dab6f3 |
Fcc: outbox
|
|
|
6dab6f3 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
6dab6f3 |
Mime-Version: 1.0
|
|
|
6dab6f3 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
6dab6f3 |
Content-Transfer-Encoding: 8bit
|
|
|
6dab6f3 |
------------
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
Patch 7.2.033
|
|
|
6dab6f3 |
Problem: When detecting a little endian BOM "ucs-2le" is used, but the text
|
|
|
6dab6f3 |
might be "utf-16le".
|
|
|
6dab6f3 |
Solution: Default to "utf-16le", it also works for "ucs-2le". (Jia Yanwei)
|
|
|
6dab6f3 |
Files: src/fileio.c, src/testdir/test42.ok
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
*** ../vim-7.2.032/src/fileio.c Sun Nov 9 13:43:25 2008
|
|
|
6dab6f3 |
--- src/fileio.c Mon Nov 3 21:21:47 2008
|
|
|
6dab6f3 |
***************
|
|
|
6dab6f3 |
*** 5550,5558 ****
|
|
|
6dab6f3 |
name = "ucs-4le"; /* FF FE 00 00 */
|
|
|
6dab6f3 |
len = 4;
|
|
|
6dab6f3 |
}
|
|
|
6dab6f3 |
! else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
|
|
|
6dab6f3 |
name = "ucs-2le"; /* FF FE */
|
|
|
6dab6f3 |
! else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
|
|
|
6dab6f3 |
name = "utf-16le"; /* FF FE */
|
|
|
6dab6f3 |
}
|
|
|
6dab6f3 |
else if (p[0] == 0xfe && p[1] == 0xff
|
|
|
6dab6f3 |
--- 5550,5559 ----
|
|
|
6dab6f3 |
name = "ucs-4le"; /* FF FE 00 00 */
|
|
|
6dab6f3 |
len = 4;
|
|
|
6dab6f3 |
}
|
|
|
6dab6f3 |
! else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
|
|
|
6dab6f3 |
name = "ucs-2le"; /* FF FE */
|
|
|
6dab6f3 |
! else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
|
|
|
6dab6f3 |
! /* utf-16le is preferred, it also works for ucs-2le text */
|
|
|
6dab6f3 |
name = "utf-16le"; /* FF FE */
|
|
|
6dab6f3 |
}
|
|
|
6dab6f3 |
else if (p[0] == 0xfe && p[1] == 0xff
|
|
|
6dab6f3 |
*** ../vim-7.2.032/src/testdir/test42.ok Sat Mar 1 13:49:21 2008
|
|
|
6dab6f3 |
--- src/testdir/test42.ok Sat Nov 1 17:09:29 2008
|
|
|
6dab6f3 |
***************
|
|
|
6dab6f3 |
*** 20,26 ****
|
|
|
6dab6f3 |
ucs-2
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
! fileencoding=ucs-2le
|
|
|
6dab6f3 |
bomb
|
|
|
6dab6f3 |
ucs-2le
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
--- 20,26 ----
|
|
|
6dab6f3 |
ucs-2
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
! fileencoding=utf-16le
|
|
|
6dab6f3 |
bomb
|
|
|
6dab6f3 |
ucs-2le
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
*** ../vim-7.2.032/src/version.c Sun Nov 9 17:21:10 2008
|
|
|
6dab6f3 |
--- src/version.c Tue Nov 11 21:54:14 2008
|
|
|
6dab6f3 |
***************
|
|
|
6dab6f3 |
*** 678,679 ****
|
|
|
6dab6f3 |
--- 678,681 ----
|
|
|
6dab6f3 |
{ /* Add new patch number below this line */
|
|
|
6dab6f3 |
+ /**/
|
|
|
6dab6f3 |
+ 33,
|
|
|
6dab6f3 |
/**/
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
--
|
|
|
6dab6f3 |
hundred-and-one symptoms of being an internet addict:
|
|
|
6dab6f3 |
234. You started college as a chemistry major, and walk out four years
|
|
|
6dab6f3 |
later as an Internet provider.
|
|
|
6dab6f3 |
|
|
|
6dab6f3 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
6dab6f3 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
6dab6f3 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
6dab6f3 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|