diff --git a/runtime/compiler/rubyunit.vim b/runtime/compiler/rubyunit.vim
new file mode 100644
index 0000000..88bf3a6
--- /dev/null
+++ b/runtime/compiler/rubyunit.vim
@@ -0,0 +1,41 @@
+" Vim compiler file
+" Language:	Test::Unit - Ruby Unit Testing Framework
+" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
+" Info:		$Id$
+" URL:		http://vim-ruby.sourceforge.net
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "rubyunit"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=testrb
+
+CompilerSet errorformat=\%W\ %\\+%\\d%\\+)\ Failure:,
+			\%C%m\ [%f:%l]:,
+		        \%E\ %\\+%\\d%\\+)\ Error:,
+			\%C%m:,
+			\%C\ \ \ \ %f:%l:%.%#,
+			\%C%m,
+			\%Z\ %#,
+			\%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 6f353bc..88ea517 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 20
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,21 +30,19 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Test11 fails sometimes. (athena, huge features)
-
-ml_get errors: :%s/^\_s\+$//gc
-And: Insert mode in one window, long file, click in other window, short file.
-
-'scrolljump' negative used as a percentage, e.g. -50 is 50% of window height?
-
 Spelling:
-- suggestion for "a an" includes "an an", which is marked bad.  Check
-  suggestions for not being a bad word (when split)?
+- Suggestions for "the the" includes "thee the" but not "the thee"?
 - CTRL-X s doesn't consider 'spellcapcheck'.
-- Have spellbadword() return a list with bad word and reason it's bad?
-  (rare/local/bad/caps)
+- Spellbadword() returns a list with bad word and reason it's bad.
+  This doesn't work when highlighting is the same for some mistakes.
 - spellsuggest() needs a way to require a capital.  A flag or context?
-- Underscore in REP items stands for space.
+
+Win32: Composing char appears on next position. (Tony Mechelynck)
+
+Support subdirectories in plugin directory?  (Nikolai Weibull)
+
+Change 'include' so that it can match the file name when \zs and \ze are
+included. (docs already done tentatively).
 
 ccomplete:
 - How to use a popup menu?
@@ -594,8 +592,7 @@
     Opposite of 'linespace': 'columnspace'.
 7   At the hit-enter prompt scrolling now no longer works.  Need to use the
     keyboard to get around this.  Pretend <CR> was hit when the user tries to
-    scroll?  Need to be able to get out of hit-enter prompt with the mouse
-    anyway.
+    scroll?
 7   Scrollbar width doesn't change when selecting other windows appearance.
     Also background color of Toolbar and rectangle below vert. scrollbar.
 7   "!start /min cmd" should run in a minimized window, instead of using
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index d984571..b77530a 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 Sep 15
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Sep 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -600,6 +600,9 @@
 "1gd" can be used like "gd" but ignores matches in a {} block that ends before
 the cursor position.  Likewise for "1gD" and "gD".
 
+'scrolljump' can be set to a negative number to scroll a percentage of the
+window height.
+
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
 
@@ -817,6 +820,9 @@
 input() takes an optional completion argument to specify the type of
 completion supported for the input. (Yegappan Lakshmanan)
 
+"dp" works with more than two buffers in diff mode if there is only one where
+'modifiable' is set.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 
diff --git a/runtime/spell/en/en_US.diff b/runtime/spell/en/en_US.diff
index f947be9..f42dc03 100644
--- a/runtime/spell/en/en_US.diff
+++ b/runtime/spell/en/en_US.diff
@@ -195,7 +195,7 @@
 + REP an_a a
 + REP a_an an
 *** en_US.orig.dic	Fri Apr 15 13:20:36 2005
---- en_US.dic	Tue Aug 16 17:03:31 2005
+--- en_US.dic	Wed Sep 21 11:36:06 2005
 ***************
 *** 5944,5946 ****
   bk
@@ -565,12 +565,16 @@
   Zubenelgenubi/M
 ***************
 *** 62077 ****
---- 62077,62084 ----
+--- 62077,62088 ----
   zymurgy/S
 + nd
 + the the/!
 + a a/!
++ an an/!
 + a an/!
 + an a/!
-+ an an/!
++ the a/!
++ the an/!
++ a the/!
++ an the/!
 + PayPal