diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 31feaf5..83f50f1 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 16
+*change.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1527,4 +1527,8 @@
 Note that using ":sort" with ":global" doesn't sort the matching lines, it's
 quite useless.
 
+The details about sorting depend on the library function used.  There is no
+guarantee that sorting is "stable" or obeys the current locale.  You will have
+to try it out.
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 83f81ad..8a96f98 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 Jun 20
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -3775,10 +3775,16 @@
 
 		{word} can be a badly spelled word followed by other text.
 		This allows for joining two words that were split.  The
-		suggestions then also include the following text.
+		suggestions also include the following text, thus you can
+		replace a line.
+
+		{word} may also be a good word.  Similar words will then be
+		returned.  {word} itself is also included, most likely as the
+		first entry, thus this can be used to check spelling.
 
 		The spelling information for the current window is used.  The
-		'spell' option must be set and 'spelllang' is relevant.
+		'spell' option must be set and the value of 'spelllang' is
+		used.
 
 
 split({expr} [, {pattern} [, {keepempty}]])			*split()*
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 5b9a541..c08f123 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 16
+*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -515,6 +515,9 @@
 		Delete breakpoint {nr}.  Use |:breaklist| to see the number of
 		each breakpoint.
 
+:breakd[el] *
+		Delete all breakpoints.
+
 :breakd[el] func [lnum] {name}
 		Delete a breakpoint in a function.
 
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 399fc67..aaef05f 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 23
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -71,9 +71,15 @@
 							*:spellw* *:spellwrong*
 :spellw[rong] {word}	Add [word} as a wrong (bad) word to 'spellfile'.
 
-After adding a word to 'spellfile' its associated ".spl" file will
-automatically be updated.  More details about the 'spellfile' format below
-|spell-wordlist-format|.
+After adding a word to 'spellfile' with the above commands its associated
+".spl" file will automatically be updated.  If you edit 'spellfile' manually
+you need to use the |:mkspell| command.  This sequence of commands mostly
+works well: >
+	:exe 'e ' . &spellfile
+<	(make changes to the spell file) >
+	:mkspell! %
+
+More details about the 'spellfile' format below |spell-wordlist-format|.
 
 
 Finding suggestions for bad words:
@@ -208,7 +214,7 @@
 
 The table with word characters is stored in the main .spl file.  Therefore it
 matters what the current locale is when generating it!  A .add.spl file does
-not contain a word table.
+not contain a word table though.
 
 A word that starts with a digit is always ignored.  That includes hex numbers
 in the form 0xff and 0XFF.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index c4d5d78..3f0df20 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2408,6 +2408,8 @@
 :source_crnl	repeat.txt	/*:source_crnl*
 :sp	windows.txt	/*:sp*
 :spe	spell.txt	/*:spe*
+:spelld	spell.txt	/*:spelld*
+:spelldump	spell.txt	/*:spelldump*
 :spellgood	spell.txt	/*:spellgood*
 :spellw	spell.txt	/*:spellw*
 :spellwrong	spell.txt	/*:spellwrong*
@@ -3703,6 +3705,7 @@
 E749	eval.txt	/*E749*
 E75	vi_diff.txt	/*E75*
 E750	repeat.txt	/*E750*
+E751	spell.txt	/*E751*
 E754	spell.txt	/*E754*
 E756	spell.txt	/*E756*
 E758	spell.txt	/*E758*
@@ -6272,6 +6275,7 @@
 spell-affix-vim	spell.txt	/*spell-affix-vim*
 spell-dic-format	spell.txt	/*spell-dic-format*
 spell-file-format	spell.txt	/*spell-file-format*
+spell-load	spell.txt	/*spell-load*
 spell-mkspell	spell.txt	/*spell-mkspell*
 spell-quickstart	spell.txt	/*spell-quickstart*
 spell-syntax	spell.txt	/*spell-syntax*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 9b61780..f9a2217 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -98,6 +98,12 @@
 
 -   Add SPELLCHECKER, with support for many languages.
     - Spell checking code todo's:
+	- Special handling of ' and -: define in the .aff file.
+	    Aspell does this with "special".
+	- Support user function to make suggestions:
+	    :set spellsuggest=MySuggest,fast
+	  Also support a list with common mistakes?
+	- For "z?" a "replace all" mechanism would be welcome.
         - Add hl groups to 'spelllang'?
 	    :set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath
 	  More complicated: Regions with different languages?  E.g.  comments
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 40002dd..f9a634c 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 21
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -681,6 +681,11 @@
 When running the tests and one of them fails to produce "test.out" the
 following tests are still executed.  This helps when running out of memory.
 
+When compiling with EXITFREE defined and the ccmalloc library it is possible
+to detect memory leaks.  Some memory will always reported as leaked, such as
+allocated by X11 library functions and the memory allocated in alloc_cmdbuff()
+to store the ":quit" command.
+
 ==============================================================================
 BUG FIXES						*bug-fixes-7*
 
diff --git a/runtime/indent/lua.vim b/runtime/indent/lua.vim
index ace7fd1..ffe03be 100644
--- a/runtime/indent/lua.vim
+++ b/runtime/indent/lua.vim
@@ -2,7 +2,7 @@
 " Language:	Lua script
 " Maintainer:	Marcus Aurelius Farias <marcus.cf 'at' bol.com.br>
 " First Author:	Max Ischenko <mfi 'at' ukr.net>
-" Last Change:	2005 Jun 09
+" Last Change:	2005 Jun 23
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -10,19 +10,19 @@
 endif
 let b:did_indent = 1
 
+setlocal indentexpr=GetLuaIndent()
+
+" To make Vim call GetLuaIndent() when it finds '\s*end' or '\s*until'
+" on the current line ('else' is default and includes 'elseif').
+setlocal indentkeys+=0=end,0=until
+
+setlocal autoindent
+
 " Only define the function once.
 if exists("*GetLuaIndent")
   finish
 endif
 
-setlocal indentexpr=GetLuaIndent()
-
-" To make Vim call GetLuaIndent() when it finds '\s*end' or '\s*until'
-" on the current line (else is default).
-setlocal indentkeys+=0=end,0=until
-
-setlocal autoindent
-
 function! GetLuaIndent()
   " Find a non-blank line above the current line.
   let lnum = prevnonblank(v:lnum - 1)
@@ -32,18 +32,19 @@
     return 0
   endif
 
-  " Add a 'shiftwidth' after lines beginning with:
-  " function, if, for, while, repeat, else, elseif, '{'
+  " Add a 'shiftwidth' after lines that start a block:
+  " 'function', 'if', 'for', 'while', 'repeat', 'else', 'elseif', '{'
   let ind = indent(lnum)
   let flag = 0
   let prevline = getline(lnum)
-  if prevline =~ '^\s*\%(if\>\|for\>\|while\>\|repeat\>\|else\>\|elseif\>\|do\>\)' || prevline =~ '{\s*$' || prevline =~ '\<function\>\s*\%(\k\|[.:]\)\{-}\s*('
+  if prevline =~ '^\s*\%(if\>\|for\>\|while\>\|repeat\>\|else\>\|elseif\>\|do\>\|then\>\)'
+        \ || prevline =~ '{\s*$' || prevline =~ '\<function\>\s*\%(\k\|[.:]\)\{-}\s*('
     let ind = ind + &shiftwidth
     let flag = 1
   endif
 
   " Subtract a 'shiftwidth' after lines ending with
-  " 'end' when they begin with while, if, for, etc.
+  " 'end' when they begin with 'while', 'if', 'for', etc. too.
   if flag == 1 && prevline =~ '\<end\>\|\<until\>'
     let ind = ind - &shiftwidth
   endif
diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl
index 739899c..54630e7 100644
--- a/runtime/spell/en.ascii.spl
+++ b/runtime/spell/en.ascii.spl
Binary files differ