Update runtime files. Make matchparen plugin backwards compatible.
Add json filetype.
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 9b465e8..0b5f69a 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 7.4. Last change: 2014 May 02
+*editing.txt* For Vim version 7.4. Last change: 2014 Jul 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1362,6 +1362,11 @@
{only available when compiled with the |+cryptv| feature} *E833*
The text in the swap file and the undo file is also encrypted. *E843*
+However, this is done block-by-block and may reduce the time needed to crack a
+password. You can disable the swap file, but then a crash will cause you to
+lose your work. The undo file can be disabled without much disadvantage. >
+ :set noundofile
+ :noswapfile edit secrets
Note: The text in memory is not encrypted. A system administrator may be able
to see your text while you are editing it. When filtering text with