diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 9eb1ba6..4a6142c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 03
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -6470,7 +6470,7 @@
 This is not guaranteed 100% secure, but it should block most attacks.
 
 							*:san* *:sandbox*
-:sandbox {cmd}		Execute {cmd} in the sandbox.  Useful to evaluate an
+:san[dbox] {cmd		Execute {cmd} in the sandbox.  Useful to evaluate an
 			option that may have been set from a modeline, e.g.
 			'foldexpr'.
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index b7f8aa7..29e336c 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5148,7 +5148,6 @@
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
-help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 5f66571..0a6dbc1 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 16
+" Last Change:	2005 Jul 06
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -52,8 +52,13 @@
 
   " If the previous line contains an "end" after a pipe, but not in an ":au"
   " command.  And not when there is a backslash before the pipe.
-  if getline(lnum) =~ '[^\\]|\s*\(ene\@!\)' && getline(lnum) !~ '^\s*au\%[tocmd]'
-    let ind = ind - &sw
+  " And when syntax HL is enabled avoid a match inside a string.
+  let line = getline(lnum)
+  let i = match(line, '[^\\]|\s*\(ene\@!\)')
+  if i > 0 && line !~ '^\s*au\%[tocmd]'
+    if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
+      let ind = ind - &sw
+    endif
   endif
 
 
diff --git a/runtime/menu.vim b/runtime/menu.vim
index a568fa1..584af54 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 28
+" Last Change:	2005 Jul 06
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -412,7 +412,7 @@
   an 40.335.110 &Tools.&Spelling.&Spell\ Check\ On		:set spell<CR>
   an 40.335.120 &Tools.&Spelling.Spell\ Check\ &Off		:set nospell<CR>
   an 40.335.130 &Tools.&Spelling.To\ &Next\ error<Tab>]s	]s
-  an 40.335.130 &Tools.&Spelling.To\ &Pevious\ error<Tab>[s	[s
+  an 40.335.130 &Tools.&Spelling.To\ &Previous\ error<Tab>[s	[s
   an 40.335.140 &Tools.&Spelling.Suggest\ &Corrections<Tab>z?	z?
   an 40.335.150 &Tools.&Spelling.&Repeat\ correction<Tab>:spellrepall	:spellrepall<CR>
   an 40.335.200 &Tools.&Spelling.-SEP1-				<Nop>
diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl
index f92ba01..b759d2f 100644
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
Binary files differ
diff --git a/src/version.h b/src/version.h
index 5936c4e..7082204 100644
--- 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 Jul 5)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 5, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 6)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 6, compiled "