summaryrefslogtreecommitdiffstats
path: root/runtime/doc/options.txt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-26 23:01:59 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-26 23:01:59 +0100
commit4f3f668c8486444e53163c29d2fc79bf47eb3c82 (patch)
tree08713fc52cdeb5172be5eed09be1bd9910d81700 /runtime/doc/options.txt
parentc4dcd60c76666bf113719f929709ad6120eb6528 (diff)
Updated runtime files.
Diffstat (limited to 'runtime/doc/options.txt')
-rw-r--r--runtime/doc/options.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 35cef9de6e..f71c4ad2dc 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.4. Last change: 2016 Mar 19
+*options.txt* For Vim version 7.4. Last change: 2016 Mar 24
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2292,6 +2292,8 @@ A jump table for the options with a short description can be found at |Q_op|.
different. The whole undo file is encrypted, not just
the pieces of text.
+ You should use "blowfish2", also to re-encrypt older files.
+
When reading an encrypted file 'cryptmethod' will be set automatically
to the detected method of the file being read. Thus if you write it
without changing 'cryptmethod' the same method will be used.
@@ -3030,8 +3032,8 @@ A jump table for the options with a short description can be found at |Q_op|.
file only, the option is not changed.
When 'binary' is set, the value of 'fileformats' is not used.
- Note that when Vim starts up with an empty buffer this option is not
- used. Set 'fileformat' in your .vimrc instead.
+ When Vim starts up with an empty buffer the first item is used. You
+ can overrule this by setting 'fileformat' in your .vimrc.
For systems with a Dos-like <EOL> (<CR><NL>), when reading files that
are ":source"ed and for vimrc files, automatic <EOL> detection may be
@@ -5115,6 +5117,7 @@ A jump table for the options with a short description can be found at |Q_op|.
written. A ":set nomodified" command also resets the original
values to the current values and the 'modified' option will be
reset.
+ Similarly for 'eol' and 'bomb'.
This option is not set when a change is made to the buffer as the
result of a BufNewFile, BufRead/BufReadPost, BufWritePost,
FileAppendPost or VimLeave autocommand event. See |gzip-example| for