--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Nov 25
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Nov 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -58,6 +58,8 @@ errors and illegal bytes.  Make default 
 	:e ++enc=xxx ++bad=drop foo.txt
 	:e ++enc=xxx ++bad=? foo.txt
 
+Win32: preserve the hidden attribute of the viminfo file.
+
 ccomplete:
 - When an option is set: In completion mode and the user types (identifier)
   characters, advance to the first match instead of removing the popup menu.
@@ -276,6 +278,7 @@ 7   Support WINDOW TABS.  Works like sev
     Roman, 2004 Dec 15.  Should then also work with Oracle Jdeveloper, see JSR
     198 standard http://www.jcp.org/en/jsr/detail?id=198.
     Eclim does it: http://eclim.sourceforge.net/  (Eric Van Dewoestine)
+    Plugin that uses a terminal emulator: http://ls10-www.cs.uni-dortmund.de/~menge/private/vimplugin.html
 -   STICKY CURSOR: Add a way of scrolling that leaves the cursor where it is.
     Especially when using the scrollbar.  Typing a cursor-movement command
     scrolls back to where the cursor is.
@@ -936,7 +939,6 @@ 8   Executing a shell, only one option f
 
 
 Macintosh:
-7   Implement "undercurl".
 7   Patch to add 'transparency' option.  Disadvantage: it's slow. (Eckehard
     Berns, 2004 May 9) http://ecki.to/vim/TransBack-2004-05-09.diff
     Needs more work.  Add when someone really wants it.

--- a/runtime/spell/de/de_CH.diff
+++ b/runtime/spell/de/de_CH.diff
@@ -1,5 +1,5 @@
-*** de_CH.orig.aff	Thu Aug 25 11:22:18 2005
---- de_CH.aff	Thu Sep 29 11:44:50 2005
+*** de_CH.orig.aff	Sat Nov 26 19:38:16 2005
+--- de_CH.aff	Sat Nov 26 19:38:08 2005
 ***************
 *** 3,4 ****
 --- 3,21 ----
@@ -23,8 +23,8 @@
 + 
   
 ***************
-*** 501 ****
---- 518,994 ----
+*** 503 ****
+--- 520,996 ----
   REP eh e
 + 
 + #   German phonetic transformation rules from Aspell

--- a/runtime/spell/de/main.aap
+++ b/runtime/spell/de/main.aap
@@ -132,6 +132,8 @@ de_AT.aff de_AT.dic: {buildcheck=}
         :delete $ZIPFILE_AT
 
         :print >>de_AT.dic
+        # delete the first line, the word count
+        :sys $VIM de_DE.dic -e -c 1delete -c wq
         :cat de_DE.dic >>de_AT.dic
         :delete de_DE.dic
         :move de_DE.aff de_AT.aff
@@ -184,7 +186,51 @@ diff:
 # ".new.aff" and ".new.dic" files are left behind for manual inspection.
 
 check:
-        :print TODO!!!!
+        :assertpkg unzip patch
+        :fetch $ZIPFILES
+        :mkdir tmp
+        :cd tmp
+        @try:
+            # Do the _AT one first, it overwrites the _DE files.
+            :sys $UNZIP ../$ZIPFILE_AT
+            :print >>de_AT.dic
+            # delete the first line, the word count
+            :sys ../$VIM de_DE.dic -e -c 1delete -c wq
+            :cat de_DE.dic >>de_AT.dic
+            :delete de_DE.dic
+            :move de_DE.aff de_AT.aff
+            :move README_de_DE.txt README_de_AT.txt
+
+            :sys $UNZIP ../$ZIPFILE_DE
+            :move de_DE_comb.aff de_DE.aff
+            :move de_DE_comb.dic de_DE.dic
+            :move README_de_DE_comb.txt README_de_DE.txt
+
+            :sys $UNZIP ../$ZIPFILE_19
+            :move de_OLDSPELL.aff de_19.aff
+            :move de_OLDSPELL.dic de_19.dic
+            # there is no README file
+            :print There is no README file for the old spelling >!README_de_19.txt
+            :sys $UNZIP ../$ZIPFILE_20
+            :move de_DE_neu.aff de_20.aff
+            :move de_DE_neu.dic de_20.dic
+            :move README_de_DE_neu.txt README_de_20.txt
+
+            :sys $UNZIP ../$ZIPFILE_CH
+
+            @import stat
+            @for nm in ['de_DE', 'de_19', 'de_20', 'de_AT', 'de_CH']:
+                @for ext in ['aff', 'dic']:
+                    :sys {force} diff ../$(nm).orig.$ext $(nm).$ext >d
+                    @if os.stat('d')[stat.ST_SIZE] > 0:
+                        :copy $(nm).$ext ../$(nm).new.$ext
+                :sys {force} diff ../README_$(nm).txt README_$(nm).txt >d
+                @if os.stat('d')[stat.ST_SIZE] > 0:
+                    :copy README_$(nm).txt ../README_$(nm).new.txt
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete $ZIPFILES
 
 
 # vim: set sts=4 sw=4 :