Fixed encryption big/little endian test.
Use uint32_t to avoid crash on 64 bit machines.
Added error numbers for Blowfish errors.
Fixed the tiny version not building.
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 98d4d63..1c4c198 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1366,10 +1366,18 @@
automatically to the method used when that file was written. You can change
'cryptmethod' before writing that file to change the method.
-When reading a file that has been encrypted and this option is not empty, it
-will be used for decryption. If the value is empty, you will be prompted to
-enter the key. If you don't enter a key, the file is edited without being
-decrypted.
+ *E817* *E818* *E819*
+When encryption does not work properly, you would be able to write your text
+to a file and never be able to read it back. Therefore a test is performed to
+check if the encryption works as expected. If you get one of these errors
+don't write the file encrypted! You need to rebuild the Vim binary to fix
+this.
+
+When reading a file that has been encrypted and the 'key' option is not empty,
+it will be used for decryption. If the value is empty, you will be prompted
+to enter the key. If you don't enter a key, or you enter the wrong key, the
+file is edited without being decrypted. There is no warning about using the
+wrong key (this makes brute force methods to find the key more difficult).
If want to start reading a file that uses a different key, set the 'key'
option to an empty string, so that Vim will prompt for a new one. Don't use
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index da0ef5b..c07549d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2054,8 +2054,10 @@
local to buffer
{not in Vi}
Method used for encryption when the buffer is written to a file:
+ *pkzip*
0 PkZip compatible method. A weak kind of encryption.
backwards compatible with Vim 7.2 and older.
+ *blowfish*
1 Blowfish method. Strong encryption. Not compatible
with Vim 7.2 and older.
When reading an encrypted file 'cryptmethod' will be set automatically
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 71611a7..9898f19 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -110,6 +110,7 @@
'cinw' options.txt /*'cinw'*
'cinwords' options.txt /*'cinwords'*
'clipboard' options.txt /*'clipboard'*
+'cm' options.txt /*'cm'*
'cmdheight' options.txt /*'cmdheight'*
'cmdwinheight' options.txt /*'cmdwinheight'*
'cmp' options.txt /*'cmp'*
@@ -132,6 +133,7 @@
'cpo' options.txt /*'cpo'*
'cpoptions' options.txt /*'cpoptions'*
'cpt' options.txt /*'cpt'*
+'cryptmethod' options.txt /*'cryptmethod'*
'cscopepathcomp' options.txt /*'cscopepathcomp'*
'cscopeprg' options.txt /*'cscopeprg'*
'cscopequickfix' options.txt /*'cscopequickfix'*
@@ -4136,6 +4138,9 @@
E814 editing.txt /*E814*
E815 if_mzsch.txt /*E815*
E816 diff.txt /*E816*
+E817 editing.txt /*E817*
+E818 editing.txt /*E818*
+E819 editing.txt /*E819*
E82 message.txt /*E82*
E83 message.txt /*E83*
E84 windows.txt /*E84*
@@ -4692,6 +4697,7 @@
blockwise-operators visual.txt /*blockwise-operators*
blockwise-register change.txt /*blockwise-register*
blockwise-visual visual.txt /*blockwise-visual*
+blowfish options.txt /*blowfish*
bold syntax.txt /*bold*
bom-bytes mbyte.txt /*bom-bytes*
book intro.txt /*book*
@@ -6910,6 +6916,7 @@
pi_tar.txt pi_tar.txt /*pi_tar.txt*
pi_vimball.txt pi_vimball.txt /*pi_vimball.txt*
pi_zip.txt pi_zip.txt /*pi_zip.txt*
+pkzip options.txt /*pkzip*
plaintex.vim syntax.txt /*plaintex.vim*
plsql ft_sql.txt /*plsql*
plugin usr_05.txt /*plugin*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 173e8ab..321ed29 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -31,11 +31,9 @@
-------------------- Known bugs and current work -----------------------
Crypt update:
-- Use 'cm' option only when FEAT_CRYPT is defined.
- When not full match with magic, check for head and give warning about
unsupported crypt method.
- if 'enc' is ucs-2, does utf-8 to ucs-2 encoding always work for seed?
-- Update E000 to error number.
Include cabal and obj syntax files. (Vincent Berthoux, 2010 May 16)
@@ -1145,6 +1143,9 @@
10.4.
- Patch for adding "J" flag to 'cinoptions': placement of jump label. (Manuel
Konig, 2010 Feb 19) Update by Lech Lorens, Feb 22.
+- Add Lua interface? (Wolfgang Oertl) patch by Luis Carvalho, 2008 Sep 5
+ Patch for Make_ming.mak from Paul Moore (2008 Sep 1)
+ http://code.google.com/p/vim-iflua/ Download vim72-lua-0.7.patch.gz
Needs some work:
- Use NSIS 2.45, it includes Windows 7 support.
Include "RequestExecutionLevel highest"
@@ -2194,9 +2195,6 @@
- Running a shell command from the GUI still has limitations. Look into how
the terminal emulator of the Vim shell project can help:
http://vimshell.wana.at
-- Add Lua interface? (Wolfgang Oertl) patch by Luis Carvalho, 2008 Sep 5
- Patch for Make_ming.mak from Paul Moore (2008 Sep 1)
- http://vim-iflua.googlecode.com/files/vim72-lua-0.7.patch.gz
8 Add a command to jump to a certain kind of tag. Allow the user to specify
values for the optional fields. E.g., ":tag size type=m".
Also allow specifying the file and command, so that the result of