updated for version 7.0218v7.0218

28 files changed, 617 insertions, 154 deletions

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c7ff8f5e41..61ce342ccb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 06
+*options.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5020,6 +5020,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Allows for mappings to work recursively.  If you do not want this for
 	a single entry, use the :noremap[!] command.
+	NOTE: To avoid portability problems with Vim scripts, always keep
+	this option at the default "on".  Only switch it off when working with
+	old Vi scripts.
 
 						*'report'*
 'report'		number	(default 2)
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 5a8370057c..76e0454ef9 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 07
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -478,8 +478,13 @@ advantages are:
 - Uses Vim search patterns.  Multi-line patterns can be used.
 - When plugins are enabled: compressed and remote files can be searched.
 	|gzip| |netrw|
-- When 'hidden' is set the files are kept loaded, thus repeating a search is
-  much faster.  Uses a lot of memory though!
+
+To be able to do this Vim loads each file as if it is being edited.  When
+there is no match in the file the assicated buffer is wiped out again.  The
+'hidden' option is ignored here to avoid running out of memory or file
+descriptors when searching many files.  However, when the |:hide| command
+modifier is used the buffers are kept loaded.  This makes following searches
+in the same files a lot faster.
 
 
 5.1 using Vim's internal grep
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 6333ad6e03..9cc30ead5d 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5484,6 +5484,7 @@ hebrew	hebrew.txt	/*hebrew*
 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/doc/todo.txt b/runtime/doc/todo.txt
index f77de5ae79..d3490ff329 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 07
+*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,6 +30,13 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Bug in Netbeans interface. (Xavier de Gaye, 2006 Mar 7)
+Code for "insert" is wrong.  Don't use b_p_eol or b_start_eol.
+Handle partial lines properly.  What probably should happen is to append to a
+line when "off" points to the NUL after that line, insert before a line when
+the text doesn't end in a "\n" and only insert line breaks where there is a
+"\n" in the argument.
+
 Win32: Describe how to do debugging and describe it. (George Reilly)
 
 Mac unicode patch (Da Woon Jung):
@@ -45,8 +52,6 @@ Mac unicode patch (Da Woon Jung):
 - With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
   (Alan Schmitt)
 
-Bug in Netbeans interface. (Xavier de Gaye, 2006 Mar 7)
-
 CONSIDERED FOR VERSION 7.0:
 
 Omni completion:
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 73ec4590fc..ec4d23de7f 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 07
+*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1873,4 +1873,7 @@ would also be the wrong value.
 When a command was defined not to take arguments and no '|' no warning message
 would be given for using a '|'.  Also with ":loadkeymap".
 
+Motif: When using a fontset and 'encoding' is "utf-8" and sizeof(wchar_t) !=
+sizeof(XChar2b) then display was wrong. (Yukihiro Nakadaira)
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/spell/af/af_ZA.diff b/runtime/spell/af/af_ZA.diff
index 9c85804ff7..4ad0e50bf7 100644
--- a/runtime/spell/af/af_ZA.diff
+++ b/runtime/spell/af/af_ZA.diff
@@ -1,8 +1,8 @@
 *** af_ZA.orig.aff	Sun Aug 14 17:37:01 2005
---- af_ZA.aff	Sun Aug 14 17:38:11 2005
+--- af_ZA.aff	Sun Jan 22 14:21:54 2006
 ***************
 *** 23,24 ****
---- 23,34 ----
+--- 23,33 ----
   
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -12,11 +12,10 @@
 + SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
 + 
 + MIDWORD	'-
-+ SLASH ,
 + 
   MAP 3
 *** af_ZA.orig.dic	Sun Aug 14 17:37:01 2005
---- af_ZA.dic	Sun Aug 14 17:38:54 2005
+--- af_ZA.dic	Sun Jan 22 14:22:17 2006
 ***************
 *** 1861,1864 ****
   T-skyf
@@ -25,8 +24,8 @@
   TLA
 --- 1861,1864 ----
   T-skyf
-! TCP,IP
-! TCP,IP-bondel
+! TCP\/IP
+! TCP\/IP-bondel
   TLA
 ***************
 *** 124109,124111 ****
diff --git a/runtime/spell/ca/ca_ES.diff b/runtime/spell/ca/ca_ES.diff
index 5838af363d..43ff90480a 100644
--- a/runtime/spell/ca/ca_ES.diff
+++ b/runtime/spell/ca/ca_ES.diff
@@ -1,5 +1,5 @@
 *** ca_ES.orig.aff	Sat Aug 13 18:33:44 2005
---- ca_ES.aff	Sat Aug 13 18:33:44 2005
+--- ca_ES.aff	Tue Jan 10 18:06:05 2006
 ***************
 *** 44,48 ****
   
@@ -31,7 +31,14 @@
 ! REP l·l l
   
 *** ca_ES.orig.dic	Sat Aug 13 18:33:44 2005
---- ca_ES.dic	Sat Aug 13 18:33:44 2005
+--- ca_ES.dic	Thu Jan 12 21:55:39 2006
+***************
+*** 1,2 ****
+! 149661
+  a/VY
+--- 1,2 ----
+! 149665
+  a/VY
 ***************
 *** 25312,25314 ****
   caos/E
diff --git a/runtime/spell/de/de_19.diff b/runtime/spell/de/de_19.diff
index 434598b4b8..8689840e3d 100644
--- a/runtime/spell/de/de_19.diff
+++ b/runtime/spell/de/de_19.diff
@@ -501,3 +501,14 @@
 + SAL ZURÜCK^^             ZURIK
 + SAL ZUVER^^              ZUFA    # x
 + SAL Z                    Z
+*** de_19.orig.dic	Thu Aug 25 11:22:08 2005
+--- de_19.dic	Sat Jan  7 12:32:09 2006
+***************
+*** 76258,76259 ****
+  zynismusfördernd/A
+! zzgl
+\ No newline at end of file
+--- 76258,76260 ----
+  zynismusfördernd/A
+! zzgl
+! 
diff --git a/runtime/spell/de/de_20.diff b/runtime/spell/de/de_20.diff
index 51809ef4bf..73141b6216 100644
--- a/runtime/spell/de/de_20.diff
+++ b/runtime/spell/de/de_20.diff
@@ -523,3 +523,11 @@
 + SAL ZURÜCK^^             ZURIK
 + SAL ZUVER^^              ZUFA    # x
 + SAL Z                    Z
+*** de_20.orig.dic	Sat Nov 26 19:59:53 2005
+--- de_20.dic	Mon Jan  2 20:19:18 2006
+***************
+*** 1,3 ****
+  314626
+- 23394
+  A-Bombe/N
+--- 1,2 ----
diff --git a/runtime/spell/de/de_DE.diff b/runtime/spell/de/de_DE.diff
index 548dd2e9e0..24e76ef0b4 100644
--- a/runtime/spell/de/de_DE.diff
+++ b/runtime/spell/de/de_DE.diff
@@ -523,3 +523,11 @@
 + SAL ZURÜCK^^             ZURIK
 + SAL ZUVER^^              ZUFA    # x
 + SAL Z                    Z
+*** de_DE.orig.dic	Sat Nov 26 19:59:52 2005
+--- de_DE.dic	Mon Jan  2 15:35:27 2006
+***************
+*** 1,3 ****
+  319017
+- 23508
+  A-Bombe/N
+--- 1,2 ----
diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl
index 524f752554..c7d5fefef1 100644
--- a/runtime/spell/en.ascii.spl
+++ b/runtime/spell/en.ascii.spl
diff --git a/runtime/spell/en.ascii.sug b/runtime/spell/en.ascii.sug
index f3a9ce8693..60055c6802 100644
--- a/runtime/spell/en.ascii.sug
+++ b/runtime/spell/en.ascii.sug
diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl
index 51a5878a82..ee14a82e15 100644
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
diff --git a/runtime/spell/en.latin1.sug b/runtime/spell/en.latin1.sug
index 06a4f5219e..736466970b 100644
--- a/runtime/spell/en.latin1.sug
+++ b/runtime/spell/en.latin1.sug
diff --git a/runtime/spell/en.utf-8.spl b/runtime/spell/en.utf-8.spl
index a04d26922c..d4fea2a8ca 100644
--- a/runtime/spell/en.utf-8.spl
+++ b/runtime/spell/en.utf-8.spl
diff --git a/runtime/spell/en.utf-8.sug b/runtime/spell/en.utf-8.sug
index 379d02d757..c1943a304c 100644
--- a/runtime/spell/en.utf-8.sug
+++ b/runtime/spell/en.utf-8.sug
diff --git a/runtime/spell/en/en_AU.diff b/runtime/spell/en/en_AU.diff
index 1621ec33f6..5dddb4797c 100644
--- a/runtime/spell/en/en_AU.diff
+++ b/runtime/spell/en/en_AU.diff
@@ -1,11 +1,11 @@
 *** en_AU.orig.aff	Fri Apr 15 13:20:36 2005
---- en_AU.aff	Sun Jul 31 22:16:19 2005
+--- en_AU.aff	Wed Jan 11 11:10:45 2006
 ***************
 *** 7,9 ****
   SET ISO8859-1
 ! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ 
   REP 24
---- 7,140 ----
+--- 7,147 ----
   SET ISO8859-1
 ! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ
 ! 
@@ -15,7 +15,7 @@
 ! 
 ! MIDWORD	'
 ! 
-! RAR ?
+! RARE ?
 ! BAD !
 ! 
 ! MAP 9
@@ -139,6 +139,13 @@
 ! SAL ZZ-                  _
 ! SAL Z                    S
 ! 
+! # When soundfolding "th" is turned into "@".  When this is mistyped as "ht" it
+! # soundfolds to "ht".  This difference is too big, thus use REP items to lower
+! # the score.
+! REPSAL 2
+! REPSAL ht @
+! REPSAL @ ht
+! 
   REP 24
 ***************
 *** 34,53 ****
@@ -162,7 +169,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 165,184 ----
+--- 172,191 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -580,7 +587,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 188,582 ----
+--- 195,589 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1664,7 +1671,7 @@
 ! SFX 3 0 ist's [aeioubp]y 
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
---- 589,1274 ----
+--- 596,1305 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2351,8 +2358,39 @@
 ! SFX 3 0 ist's [aeioubp]y
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
+! 
+! 
+! # list of 250 most common English words (plucked from the internet)
+! COMMON the of to and a in is it you that he was for on are with as I his they
+! COMMON be at one have this from or had by hot word but what some we can out
+! COMMON other were all there when up use your how said an each she which do
+! COMMON their time if will way about many then them write would like so these
+! COMMON her long make thing see him two has look more day could go come did
+! COMMON number sound no most people my over know water than call first who
+! COMMON may down side been now find any new work part take get place made live
+! COMMON where after back little only round man year came show every good me
+! COMMON give our under name very through just form sentence great think say
+! COMMON help low line differ turn cause much mean before move right boy old too
+! COMMON same tell does set three want air well also play small end put home
+! COMMON read hand port large spell add even land here must big high such follow
+! COMMON act why ask men change went light kind off need house picture try
+! COMMON us again animal point mother world near build self earth father head
+! COMMON stand own page should country found answer school grow study still
+! COMMON learn plant cover food sun four between state keep eye never last let
+! COMMON thought city tree cross farm hard start might story saw far sea draw
+! COMMON left late run don't while press close night real life few north
+! 
+! # a few more for consistency
+! COMMON five six seven eight nine ten hundred thousand
 *** en_AU.orig.dic	Fri Apr 15 13:20:36 2005
---- en_AU.dic	Sat Oct  8 15:54:05 2005
+--- en_AU.dic	Wed Mar  8 13:14:30 2006
+***************
+*** 1,2 ****
+! 45654
+  AA
+--- 1,2 ----
+! 45653
+  AA
 ***************
 *** 912,914 ****
   Alaska/M
@@ -2628,12 +2666,15 @@
 --- 45578,45579 ----
 ***************
 *** 45655 ****
---- 45646,45653 ----
+--- 45646,45656 ----
   zymurgy/S
 + nd
 + the the/!
++ and and/!
 + a a/!
 + a an/!
 + an a/!
 + an an/!
 + PayPal
++ Google
++ TCP\/IP
diff --git a/runtime/spell/en/en_CA.diff b/runtime/spell/en/en_CA.diff
index 528bab4332..d9995710b1 100644
--- a/runtime/spell/en/en_CA.diff
+++ b/runtime/spell/en/en_CA.diff
@@ -1,8 +1,8 @@
 *** en_CA.orig.aff	Fri Apr 15 13:20:36 2005
---- en_CA.aff	Sun Jul 31 22:16:56 2005
+--- en_CA.aff	Wed Jan 11 22:03:23 2006
 ***************
 *** 3,4 ****
---- 3,134 ----
+--- 3,141 ----
   
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -10,7 +10,7 @@
 + 
 + MIDWORD	'
 + 
-+ RAR ?
++ RARE ?
 + BAD !
 + 
 + MAP 9
@@ -134,6 +134,13 @@
 + SAL ZZ-                  _
 + SAL Z                    S
 + 
++ # When soundfolding "th" is turned into "@".  When this is mistyped as "ht" it
++ # soundfolds to "ht".  This difference is too big, thus use REP items to lower
++ # the score.
++ REPSAL 2
++ REPSAL ht @
++ REPSAL @ ht
++ 
   PFX A Y 1
 ***************
 *** 30,33 ****
@@ -141,7 +148,7 @@
 ! SFX N   y     ication    y 
 ! SFX N   0     en         [^ey] 
   
---- 160,163 ----
+--- 167,170 ----
   SFX N   e     ion        e
 ! SFX N   y     ication    y
 ! SFX N   0     en         [^ey]
@@ -151,7 +158,7 @@
   SFX H   y     ieth       y
 ! SFX H   0     th         [^y] 
   
---- 170,172 ----
+--- 177,179 ----
   SFX H   y     ieth       y
 ! SFX H   0     th         [^y]
   
@@ -160,12 +167,12 @@
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e] 
   
---- 177,179 ----
+--- 184,186 ----
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e]
   
 *** en_CA.orig.dic	Sat Apr 16 14:40:06 2005
---- en_CA.dic	Sat Oct  8 15:54:16 2005
+--- en_CA.dic	Wed Mar  8 13:14:35 2006
 ***************
 *** 46,48 ****
   R/G
@@ -437,13 +444,16 @@
   felicitous/IY
 ***************
 *** 62341 ****
---- 62343,62351 ----
+--- 62343,62354 ----
   data/M
 + et al.
 + the the/!
++ and and/!
 + a a/!
 + a an/!
 + an a/!
 + an an/!
 + PayPal
++ Google
 + e.g.
++ TCP\/IP
diff --git a/runtime/spell/en/en_GB.diff b/runtime/spell/en/en_GB.diff
index 980502d11f..dabb74b1c4 100644
--- a/runtime/spell/en/en_GB.diff
+++ b/runtime/spell/en/en_GB.diff
@@ -1,8 +1,8 @@
 *** en_GB.orig.aff	Sun Jul  3 17:53:13 2005
---- en_GB.aff	Sun Jul 31 22:17:09 2005
+--- en_GB.aff	Wed Jan 11 22:03:27 2006
 ***************
 *** 8,9 ****
---- 8,140 ----
+--- 8,147 ----
   TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ
 + 
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -11,7 +11,7 @@
 + 
 + MIDWORD	'
 + 
-+ RAR ?
++ RARE ?
 + BAD !
 + 
 + MAP 9
@@ -135,6 +135,13 @@
 + SAL ZZ-                  _
 + SAL Z                    S
 + 
++ # When soundfolding "th" is turned into "@".  When this is mistyped as "ht" it
++ # soundfolds to "ht".  This difference is too big, thus use REP items to lower
++ # the score.
++ REPSAL 2
++ REPSAL ht @
++ REPSAL @ ht
++ 
   REP 27
 ***************
 *** 37,56 ****
@@ -158,7 +165,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 168,187 ----
+--- 175,194 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -576,7 +583,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 191,585 ----
+--- 198,592 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1664,7 +1671,7 @@
 ! SFX 3 0 ist's [aeioubp]y 
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
---- 592,1281 ----
+--- 599,1288 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2356,7 +2363,7 @@
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
 *** en_GB.orig.dic	Sun Jul  3 18:05:07 2005
---- en_GB.dic	Wed Sep 28 23:07:50 2005
+--- en_GB.dic	Wed Mar  8 13:14:37 2006
 ***************
 *** 630,632 ****
   Byrne/M
@@ -2544,7 +2551,7 @@
 --- 45670,45671 ----
 ***************
 *** 46281 ****
---- 46260,46275 ----
+--- 46260,46278 ----
   Zurich/M
 + conj.
 + pompon
@@ -2556,8 +2563,11 @@
 + Moolenaar/M
 + pneumonic
 + the the/!
++ and and/!
 + a a/!
 + a an/!
 + an a/!
 + an an/!
 + PayPal
++ Google
++ TCP\/IP
diff --git a/runtime/spell/en/en_NZ.diff b/runtime/spell/en/en_NZ.diff
index 5250a8eef1..3652d99c9e 100644
--- a/runtime/spell/en/en_NZ.diff
+++ b/runtime/spell/en/en_NZ.diff
@@ -1,11 +1,11 @@
 *** en_NZ.orig.aff	Fri Apr 15 13:20:36 2005
---- en_NZ.aff	Sun Jul 31 22:17:27 2005
+--- en_NZ.aff	Wed Jan 11 22:03:30 2006
 ***************
 *** 7,9 ****
   SET ISO8859-1
 ! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ 
   REP 66
---- 7,140 ----
+--- 7,147 ----
   SET ISO8859-1
 ! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ
 ! 
@@ -15,7 +15,7 @@
 ! 
 ! MIDWORD	'
 ! 
-! RAR ?
+! RARE ?
 ! BAD !
 ! 
 ! MAP 9
@@ -139,6 +139,13 @@
 ! SAL ZZ-                  _
 ! SAL Z                    S
 ! 
+! # When soundfolding "th" is turned into "@".  When this is mistyped as "ht" it
+! # soundfolds to "ht".  This difference is too big, thus use REP items to lower
+! # the score.
+! REPSAL 2
+! REPSAL ht @
+! REPSAL @ ht
+! 
   REP 66
 ***************
 *** 76,95 ****
@@ -162,7 +169,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 207,226 ----
+--- 214,233 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -580,7 +587,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 230,624 ----
+--- 237,631 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1665,7 +1672,7 @@
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
 \ No newline at end of file
---- 631,1316 ----
+--- 638,1323 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2353,7 +2360,7 @@
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
 *** en_NZ.orig.dic	Fri Apr 15 13:20:36 2005
---- en_NZ.dic	Wed Sep 28 23:08:01 2005
+--- en_NZ.dic	Wed Mar  8 13:14:40 2006
 ***************
 *** 4,6 ****
   2ZB
@@ -2673,13 +2680,16 @@
   Burkina
 ! Faso/M
 \ No newline at end of file
---- 47109,47117 ----
+--- 47109,47120 ----
   Burkina
 ! Faso/M
 ! nd
 ! the the/!
+! and and/!
 ! a a/!
 ! a an/!
 ! an a/!
 ! an an/!
 ! PayPal
+! Google
+! TCP\/IP
diff --git a/runtime/spell/en/en_US.diff b/runtime/spell/en/en_US.diff
index b0db2b3490..ee0b3fecc3 100644
--- a/runtime/spell/en/en_US.diff
+++ b/runtime/spell/en/en_US.diff
@@ -1,8 +1,8 @@
 *** en_US.orig.aff	Fri Apr 15 13:20:36 2005
---- en_US.aff	Wed Sep 28 22:06:01 2005
+--- en_US.aff	Wed Jan 11 22:03:34 2006
 ***************
 *** 3,4 ****
---- 3,134 ----
+--- 3,141 ----
   
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -10,7 +10,7 @@
 + 
 + MIDWORD	'
 + 
-+ RAR ?
++ RARE ?
 + BAD !
 + 
 + MAP 9
@@ -134,6 +134,13 @@
 + SAL ZZ-                  _
 + SAL Z                    S
 + 
++ # When soundfolding "th" is turned into "@".  When this is mistyped as "ht" it
++ # soundfolds to "ht".  This difference is too big, thus use REP items to lower
++ # the score.
++ REPSAL 2
++ REPSAL ht @
++ REPSAL @ ht
++ 
   PFX A Y 1
 ***************
 *** 30,33 ****
@@ -141,7 +148,7 @@
 ! SFX N   y     ication    y 
 ! SFX N   0     en         [^ey] 
   
---- 160,163 ----
+--- 167,170 ----
   SFX N   e     ion        e
 ! SFX N   y     ication    y
 ! SFX N   0     en         [^ey]
@@ -151,7 +158,7 @@
   SFX H   y     ieth       y
 ! SFX H   0     th         [^y] 
   
---- 170,172 ----
+--- 177,179 ----
   SFX H   y     ieth       y
 ! SFX H   0     th         [^y]
   
@@ -160,7 +167,7 @@
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e] 
   
---- 177,179 ----
+--- 184,186 ----
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e]
   
@@ -169,33 +176,40 @@
   
 ! REP 88
   REP a ei
---- 229,231 ----
+--- 236,238 ----
   
 ! REP 91
   REP a ei
 ***************
 *** 137,138 ****
---- 267,270 ----
+--- 274,277 ----
   REP uy i
 + REP y ie
 + REP ie y
   REP i ee
 ***************
 *** 174,175 ****
---- 306,308 ----
+--- 313,315 ----
   REP ew ue
 + REP uf ough
   REP uff ough
 ***************
 *** 188 ****
---- 321,325 ----
+--- 328,332 ----
   REP shun cion
 + REP an_a a
 + REP an_a an
 + REP a_an a
 + REP a_an an
 *** en_US.orig.dic	Fri Apr 15 13:20:36 2005
---- en_US.dic	Sat Oct  8 15:54:26 2005
+--- en_US.dic	Wed Mar  8 13:14:43 2006
+***************
+*** 1,2 ****
+! 62076
+  a
+--- 1,2 ----
+! 62078
+  a
 ***************
 *** 5944,5946 ****
   bk
@@ -565,10 +579,11 @@
   Zubenelgenubi/M
 ***************
 *** 62077 ****
---- 62077,62089 ----
+--- 62077,62092 ----
   zymurgy/S
 + nd
 + the the/!
++ and and/!
 + a a/!
 + an an/!
 + a an/!
@@ -578,4 +593,6 @@
 + a the/!
 + an the/!
 + PayPal
++ Google
 + e.g.
++ TCP\/IP
diff --git a/runtime/spell/fr/fr_FR.diff b/runtime/spell/fr/fr_FR.diff
index 4a9cf8d052..bd6caf1d1c 100644
--- a/runtime/spell/fr/fr_FR.diff
+++ b/runtime/spell/fr/fr_FR.diff
@@ -1,5 +1,5 @@
-*** fr_FR.orig.aff	Sun Jul  3 19:34:20 2005
---- fr_FR.aff	Fri Sep 30 12:58:29 2005
+*** fr_FR.orig.aff	Sun Oct  2 12:36:49 2005
+--- fr_FR.aff	Sun Oct  2 12:36:49 2005
 ***************
 *** 3,4 ****
 --- 3,21 ----
diff --git a/runtime/spell/it/it_IT.diff b/runtime/spell/it/it_IT.diff
index 03b213367a..f032bce500 100644
--- a/runtime/spell/it/it_IT.diff
+++ b/runtime/spell/it/it_IT.diff
@@ -1,8 +1,8 @@
 *** it_IT.orig.aff	Sun Jul 31 14:20:13 2005
---- it_IT.aff	Tue Aug  9 21:50:25 2005
+--- it_IT.aff	Tue Jan 10 18:06:11 2006
 ***************
 *** 33,34 ****
---- 33,58 ----
+--- 33,61 ----
   
 + # This is no longer required, now that we compress after adding every so many
 + # words.
@@ -15,6 +15,9 @@
 + SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¿
 + SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
 + 
++ # Building the soundfold tree takes too much memory, skip it.
++ NOSUGFILE
++ 
 + MIDWORD	'
 + 
 + MAP 9
@@ -34,7 +37,7 @@
   
 ! PFX T Y 148
   PFX T 0 l' [aeiouhAEIOUH]
---- 1136,1138 ----
+--- 1139,1141 ----
   
 ! PFX T Y 70
   PFX T 0 l' [aeiouhAEIOUH]
@@ -49,7 +52,7 @@
 - PFX T u L'U u
 - PFX T h L'H h
   PFX T 0 all' [aeiouhAEIOUH]
---- 1144,1145 ----
+--- 1147,1148 ----
 ***************
 *** 1134,1143 ****
   PFX T h all'H h
@@ -62,7 +65,7 @@
 - PFX T h All'H h
 - PFX T 0 ALL' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 dell' [aeiouhAEIOUH]
---- 1151,1152 ----
+--- 1154,1155 ----
 ***************
 *** 1149,1158 ****
   PFX T h dell'H h
@@ -75,7 +78,7 @@
 - PFX T h Dell'H h
 - PFX T 0 DELL' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 dall' [aeiouhAEIOUH]
---- 1158,1159 ----
+--- 1161,1162 ----
 ***************
 *** 1164,1173 ****
   PFX T h dall'H h
@@ -88,7 +91,7 @@
 - PFX T h Dall'H h
 - PFX T 0 DALL' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 nell' [aeiouhAEIOUH]
---- 1165,1166 ----
+--- 1168,1169 ----
 ***************
 *** 1179,1188 ****
   PFX T h nell'H h
@@ -101,7 +104,7 @@
 - PFX T h Nell'H h
 - PFX T 0 NELL' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 sull' [aeiouhAEIOUH]
---- 1172,1173 ----
+--- 1175,1176 ----
 ***************
 *** 1194,1203 ****
   PFX T h sull'H h
@@ -114,7 +117,7 @@
 - PFX T h Sull'H h
 - PFX T 0 SULL' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 coll' [aeiouhAEIOUH]
---- 1179,1180 ----
+--- 1182,1183 ----
 ***************
 *** 1209,1218 ****
   PFX T h coll'H h
@@ -127,7 +130,7 @@
 - PFX T h Coll'H h
 - PFX T 0 COLL' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 d' [aeiouhAEIOUH]
---- 1186,1187 ----
+--- 1189,1190 ----
 ***************
 *** 1224,1232 ****
   PFX T h d'H h
@@ -139,7 +142,7 @@
 - PFX T u D'U u
 - PFX T h D'H h
   PFX T 0 quest' [aeiouhAEIOUH]
---- 1193,1194 ----
+--- 1196,1197 ----
 ***************
 *** 1238,1247 ****
   PFX T h quest'H h
@@ -152,7 +155,7 @@
 - PFX T h Quest'H h
 - PFX T 0 QUEST' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX T 0 quell' [aeiouhAEIOUH]
---- 1200,1201 ----
+--- 1203,1204 ----
 ***************
 *** 1253,1264 ****
   PFX T h quell'H h
@@ -167,7 +170,7 @@
   
 ! PFX U Y 30
   PFX U 0 un' [aeiouhAEIOUH]
---- 1207,1210 ----
+--- 1210,1213 ----
   PFX T h quell'H h
   
 ! PFX U Y 14
@@ -184,7 +187,7 @@
 - PFX U h Un'H h
 - PFX U 0 UN' [AEIOUH][QWERTYUIOPLKJHGFDSAZXCVBNM]
   PFX U 0 ciascun' [aeiouhAEIOUH]
---- 1216,1217 ----
+--- 1219,1220 ----
 ***************
 *** 1285,1296 ****
   PFX U h ciascun'H h
@@ -199,7 +202,7 @@
   
 ! PFX X Y 72
   PFX X 0 m' [aeiouAEIOU]
---- 1223,1226 ----
+--- 1226,1229 ----
   PFX U h ciascun'H h
   
 ! PFX X Y 36
@@ -214,7 +217,7 @@
 - PFX X o M'O o
 - PFX X u M'U u
   PFX X 0 t' [aeiouAEIOU]
---- 1231,1232 ----
+--- 1234,1235 ----
 ***************
 *** 1313,1320 ****
   PFX X u t'U u
@@ -225,7 +228,7 @@
 - PFX X o T'O o
 - PFX X u T'U u
   PFX X 0 s' [aeiouAEIOU]
---- 1237,1238 ----
+--- 1240,1241 ----
 ***************
 *** 1325,1332 ****
   PFX X u s'U u
@@ -236,7 +239,7 @@
 - PFX X o S'O o
 - PFX X u S'U u
   PFX X 0 c' [aeiouAEIOU]
---- 1243,1244 ----