Change 'cryptmethod' from a number to a string option.  Make it global-local.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 8763661..6254937 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -7265,7 +7265,7 @@
 
 Support GDK_SUPER_MASK for GTK on Mac. (Stephan Schulz)
 
-Made CTRL modifier work for mouse wheel. (Benjamin Haskell)
+Made CTRL and ALT modifier work for mouse wheel. (Benjamin Haskell)
 
 When the buffer is in diff mode, have :TOhtml create HTML to show the diff
 side-by-side.  (Christian Brabandt)
@@ -10031,5 +10031,10 @@
 
 "g8" doesn't work properly on a NUL.
 
+Fixed crash for ":find" completion, might also happen in other path expansion
+usage.
+
+When 'searchhl' causes a hang make CTRL-C disable 'shearchhl'.
+
 
  vim:tw=78:ts=8:ft=help:norl: