Mercurial > vim
changeset 596:e612bbdb670f
updated for version 7.0169
| author | vimboss |
|---|---|
| date | Tue, 13 Dec 2005 20:04:55 +0000 |
| parents | fea48f63efc8 |
| children | b9975513fe24 |
| files | runtime/doc/options.txt runtime/doc/tags src/version.h |
| diffstat | 3 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2005 Dec 12 +*options.txt* For Vim version 7.0aa. Last change: 2005 Dec 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2545,7 +2545,9 @@ A jump table for the options with a shor 'encoding' is "utf-8" (or one of the other Unicode variants) conversion is most likely done in a way that the reverse conversion results in the same text. When 'encoding' is not - "utf-8" special characters may be lost! + "utf-8" some non-ASCII characters may be lost! You can use + the |++bad| argument to specify what is done with characters + that can't be converted. For an empty file or a file with only ASCII characters most encodings will work and the first entry of 'fileencodings' will be used (except "ucs-bom", which requires the BOM to be present). If you prefer @@ -2555,7 +2557,9 @@ A jump table for the options with a shor \ set fenc=iso-2022-jp | endif < This sets 'fileencoding' to "iso-2022-jp" if the file does not contain non-blank characters. - Note that 'fileencodings' is not used for an new file, 'fileencoding' + When the |++enc| argument is used then the value of 'fileencodings' is + not used. + Note that 'fileencodings' is not used for a new file, 'fileencoding' is always empty then. This means that a non-existing file may get a different encoding than an empty file. The special value "ucs-bom" can be used to check for a Unicode BOM
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1013,6 +1013,7 @@ ( motion.txt /*(* ) motion.txt /*)* + motion.txt /*+* +++bad editing.txt /*++bad* ++bin editing.txt /*++bin* ++builtin_terms various.txt /*++builtin_terms* ++enc editing.txt /*++enc*
--- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 12)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 12, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 13)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 13, compiled "