updated for version 7.0169

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cea358899bf213e770b84dd8430f1bf31d7349fc..d3db1022482662af3e1f4379844e63e0c50745ad 100644 (file)
--- 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 short description can be found at |Q_op|.
                '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 short description can be found at |Q_op|.
                        \ 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

diff --git a/runtime/doc/tags b/runtime/doc/tags
index 157e164a86925611537eff657e2eedba2ab45d61..6b572fd408c83db3265830aa07001cf37f619303 100644 (file)
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1013,6 +1013,7 @@ $VIMRUNTIME       starting.txt    /*$VIMRUNTIME*
 (      motion.txt      /*(*
 )      motion.txt      /*)*
 +      motion.txt      /*+*
+++bad  editing.txt     /*++bad*
 ++bin  editing.txt     /*++bin*
 ++builtin_terms        various.txt     /*++builtin_terms*
 ++enc  editing.txt     /*++enc*

diff --git a/src/version.h b/src/version.h
index 267dd1d60211046223de7ff653cd144cfc57a1b8..3480844174e5760a6fb1b91b7dbdf0d92c511011 100644 (file)
--- 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 "