updated for version 7.0152
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 6c32f16..fa51c2a 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 Sep 25
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1626,7 +1626,8 @@
 sort( {list} [, {func}])	List	sort {list}, using {func} to compare
 soundfold( {word})		String	sound-fold {word}
 spellbadword()			String	badly spelled word at cursor
-spellsuggest( {word} [, {max}])	List	spelling suggestions
+spellsuggest( {word} [, {max} [, {capital}]])
+				List	spelling suggestions
 split( {expr} [, {pat} [, {keepempty}]])
 				List	make List from {pat} separated {expr}
 strftime( {format}[, {time}])	String	time in specified format
@@ -4076,19 +4077,23 @@
 		used.
 
 							*spellsuggest()*
-spellsuggest({word} [, {max}])
+spellsuggest({word} [, {max} [, {capital}]])
 		Return a List with spelling suggestions to replace {word}.
 		When {max} is given up to this number of suggestions are
 		returned.  Otherwise up to 25 suggestions are returned.
 
+		When the {capital} argument is given and it's non-zero only
+		suggestions with a leading capital will be given.  Use this
+		after a match with 'spellcapcheck'.
+
 		{word} can be a badly spelled word followed by other text.
 		This allows for joining two words that were split.  The
 		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.
+		returned.  {word} itself is not included in the suggestions,
+		although it may appear capitalized.
 
 		The spelling information for the current window is used.  The
 		'spell' option must be set and the values of 'spelllang' and
diff --git a/runtime/spell/bg/bg_BG.diff b/runtime/spell/bg/bg_BG.diff
index 3d9bb98..e3ccbb6 100644
--- a/runtime/spell/bg/bg_BG.diff
+++ b/runtime/spell/bg/bg_BG.diff
@@ -1,5 +1,5 @@
 *** bg_BG.orig.aff	Sun Aug 28 21:34:44 2005
---- bg_BG.aff	Sun Aug 28 21:34:44 2005
+--- bg_BG.aff	Thu Sep 29 21:59:31 2005
 ***************
 *** 1,2 ****
 ! SET microsoft-cp1251
@@ -33,10 +33,154 @@
   MAP PÐ
 - MAP YÓ
   MAP XÕ
---- 1706,1711 ----
+--- 1706,1855 ----
   MAP PÐ
   MAP XÕ
 + 
 + REP 2
 + REP Y Ó
 + REP Ó Y
++ 
++ #   Bulgarian phonetic transformation rules for use with Aspell
++ #   Copyright (C) 2003 Anton Zinoviev
++ #
++ #   This software may be used and distributed under the same terms as
++ #   the other parts of the bgoffice project.
++ #
++ #   Changelog:
++ #
++ #   19.IX.2003  Anton Zinoviev <zinoviev@debian.org>
++ #               Initial release
++ 
++ SAL version         1
++ SAL followup        0
++ SAL collapse_result 1
++ 
++ SAL À                           Ú
++ SAL Ú                           Ú
++ SAL Î                           Ó
++ SAL Ó                           Ó
++ SAL Å                           È
++ SAL È                           È
++ SAL Þ                           Ó
++ SAL ß                           Ú
++ SAL É                           _
++ SAL Ü                           _
++ SAL ÁÑÊ                         ÏÊ
++ SAL ÁÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ï
++ SAL ÁT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ï
++ SAL ÁÄ$                         Ï
++ SAL ÁT$                         Ï
++ SAL Á                           Ï
++ SAL ÂÑÊ                         ÔÊ
++ SAL ÂÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ô
++ SAL ÂT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ô
++ SAL ÂÄ$                         Ô
++ SAL ÂT$                         Ô
++ SAL Â                           Ô
++ SAL ÃÑÊ                         Ê
++ SAL ÃÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ê
++ SAL ÃT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ê
++ SAL ÃÄ$                         Ê
++ SAL ÃT$                         Ê
++ SAL Ã                           Ê
++ SAL ÄÑÊ<                        ÒÊ
++ SAL ÄÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ò
++ SAL ÄT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ò
++ SAL ÄÄ$                         Ò
++ SAL ÄT$                         Ò
++ SAL Ä                           Ò
++ SAL ÆÑÊ                         ØÊ
++ SAL ÆÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ø
++ SAL ÆT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ø
++ SAL ÆÄ$                         Ø
++ SAL ÆT$                         Ø
++ SAL Æ                           Ø
++ SAL ÇÑÊ                         ÑÊ
++ SAL ÇÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ñ
++ SAL ÇT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ñ
++ SAL ÇÄ$                         Ñ
++ SAL ÇT$                         Ñ
++ SAL Ç                           Ñ
++ SAL ÊÑÊ                         Ê
++ SAL ÊÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ê
++ SAL ÊT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ê
++ SAL ÊÄ$                         Ê
++ SAL ÊT$                         Ê
++ SAL Ê                           Ê
++ SAL ËÑÊ                         ËÊ
++ SAL ËÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ë
++ SAL ËT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ë
++ SAL ËÄ$                         Ë
++ SAL ËT$                         Ë
++ SAL Ë                           Ë
++ SAL ÌÑÊ                         ÌÊ
++ SAL ÌÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ì
++ SAL ÌT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ì
++ SAL ÌÄ$                         Ì
++ SAL ÌT$                         Ì
++ SAL Ì                           Ì
++ SAL ÍÑÊ                         ÍÊ
++ SAL ÍÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Í
++ SAL ÍT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Í
++ SAL ÍÄ$                         Í
++ SAL ÍT$                         Í
++ SAL Í                           Í
++ SAL ÏÑÊ                         ÏÊ
++ SAL ÏÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ï
++ SAL ÏT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ï
++ SAL ÏÄ$                         Ï
++ SAL ÏT$                         Ï
++ SAL Ï                           Ï
++ SAL ÐÑÊ                         ÐÊ
++ SAL ÐÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ð
++ SAL ÐT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ð
++ SAL ÐÄ$                         Ð
++ SAL ÐT$                         Ð
++ SAL Ð                           Ð
++ SAL ÑÑÊ                         ÑÊ
++ SAL ÑÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ñ
++ SAL ÑT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ñ
++ SAL ÑÄ$                         Ñ
++ SAL ÑT$                         Ñ
++ SAL Ñ                           Ñ
++ SAL ÒÑÊ<                        ÒÊ
++ SAL ÒÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ò
++ SAL ÒT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ò
++ SAL ÒÄ$                         Ò
++ SAL ÒT$                         Ò
++ SAL Ò                           Ò
++ SAL ÔÑÊ                         ÔÊ
++ SAL ÔÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ô
++ SAL ÔT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ô
++ SAL ÔÄ$                         Ô
++ SAL ÔT$                         Ô
++ SAL Ô                           Ô
++ SAL ÕÑÊ                         ÕÊ
++ SAL ÕÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Õ
++ SAL ÕT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Õ
++ SAL ÕÄ$                         Õ
++ SAL ÕT$                         Õ
++ SAL Õ                           Õ
++ SAL ÖÑÊ                         ÖÊ
++ SAL ÖÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ö
++ SAL ÖT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ö
++ SAL ÖÄ$                         Ö
++ SAL ÖT$                         Ö
++ SAL Ö                           Ö
++ SAL ×ÑÊ                         ×Ê
++ SAL ×Ä(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   ×
++ SAL ×T(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   ×
++ SAL ×Ä$                         ×
++ SAL ×T$                         ×
++ SAL ×                           ×
++ SAL ØÑÊ                         ØÊ
++ SAL ØÄ(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ø
++ SAL ØT(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-   Ø
++ SAL ØÄ$                         Ø
++ SAL ØT$                         Ø
++ SAL Ø                           Ø
++ SAL ÙÑÊ                         ØÊ
++ SAL Ù(ÁÂÃÄÆÇÊËÌÍÏÐÑÒÃÕÖרÙ)-    Ø
++ SAL Ù$                          Ø
++ SAL Ù                           Ù
diff --git a/runtime/spell/gd/gd_GB.diff b/runtime/spell/gd/gd_GB.diff
index 616bae7..ec4797c 100644
--- a/runtime/spell/gd/gd_GB.diff
+++ b/runtime/spell/gd/gd_GB.diff
@@ -1,17 +1,14 @@
 *** gd_GB.orig.aff	Wed Aug 31 20:50:02 2005
---- gd_GB.aff	Wed Aug 31 20:50:43 2005
+--- gd_GB.aff	Fri Sep 30 13:04:30 2005
 ***************
 *** 19 ****
---- 19,39 ----
+--- 19,317 ----
   TRY ahinrdesclgoutmbàf-òACìTùBpGSDMèIRPLNEFéO'UóÀÒÌÙHÉÈ
 + 
 + FOL  ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ
 + LOW  ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ
 + UPP  ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ
 + 
-+ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¿
-+ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
-+ 
 + MIDWORD	'-
 + 
 + MAP 9
@@ -24,3 +21,284 @@
 + MAP cç
 + MAP yÿý
 + MAP sß
++ 
++ # soundslike mapping from Aspell
++ # Aspell phonetics for Irish, by Kevin Scannell <scannell@slu.edu>
++ # Copyright 2002, 2003 Kevin P. Scannell, distributed under GNU GPL
++ # version 2.0
++ 
++ SAL followup 0                    # else breaks QU^, e.g.
++ SAL collapse_result 1             # no double letters in resulting strings
++ 
++ SAL ANBHANN-----         *N*      # epenthetic vowel, anbhanna? only, see NBH--
++ SAL ANBHAIN-----         *N*      # epenthetic vowel, anbhainne? only, see NBH--
++ SAL AERGA--              *R       # epenthetic exception, see RG, aerga only
++ SAL AORG-                *R       # epenthetic exception, see RG, [ms]aorg*, etc.
++ SAL AEILG-               *L       # epenthetic exception, Gaeilge* only, see LG 
++ SAL AILBH--              *L*      # epenthetic vowel, [bcs]ailbh* only, see LBH--
++ SAL ALBHÁD----           *L       # galbhád only, next few are exceptions to ALBH
++ SAL ALBHÁID-----         *L       # galbháid only (coinnealbháidís, etc. b4)
++ SAL ALBHR---             *L       # pobalbhreith, galbhruith, etc. except. to next
++ SAL ALBH--               *L*      # epenthetic vowel
++ SAL ARBHÁD----           *R       # mótarbhád only, exception to ARBH epenth.
++ SAL ARBHÁID-----         *R       # mótarbháid only,   "       "   "    " 
++ SAL ARBHUIL-----         *R       # epenth. exception, garbhuille only, cuarbh* b4
++ SAL ARBHUA----           *R       # epenth. exception, eadarbhuas* only
++ SAL ARBHIN----           *R*      # exception to next, marbhintinn* only
++ SAL ARBH(EI)---          *R       # epenthetic exception to next, *tarbhealach, etc.
++ SAL ARBH--               *R*      # epenthetic, garbh, dearbh, etc. - [IU]ARBH b4
++ SAL ATHFH(ÁÉÓAEIOU)---   *H       # athfhill,uathfheidhmeach,etc.-exception to next
++ SAL ATH(BCDFGLMNPRST)-   *        # athlas, mionathrú, etc. - exception to TH->H
++ SAL ADH                  *        # bladhm, feadhain, tadhall, adhmad, -adh$, etc.
++ SAL AGHI---              *        # exception to AGH, corraghiob only
++ SAL AGHLOIN------        *        #   "       "  ", pleicseaghl- only (not aghloit)
++ SAL AGH                  *        # slaghdán, treaghd, saghas, etc.
++ SAL AOMH(FLNST)---       *        # faomh[ft]-,caomhn*,naomh* only, OMH exception
++ SAL A                    *
++ SAL ÁIRG-                *R       # epenthetic exception, see RG, táirg*, etc.
++ SAL ÁDHU---              *        # pádhuille only, exception to next
++ SAL ÁDH                  *        # ádhúil, -ádh$ only
++ SAL ÁTHFH--              *H       # táthfhéithleann, gnáthfh- only exception to next
++ SAL ÁTH(BCDFGLMNPRST)-   *        # fáthscéal, gnáth*, bláthfhleasc, etc.
++ SAL Á                    *
++ SAL BANBH^$              B*N*V    # epenthetic vowel, see NBH--, banbh, not -arún
++ SAL BHANBH^$             V*N*V    # epenthetic vowel, see NBH--
++ SAL BAINBH^$             B*N*V    # epenthetic vowel, see NBH--, bainbh only
++ SAL BHAINBH^$            V*N*V    # epenthetic vowel, see NBH--
++ SAL BH                   V        # includes bh$, eclipsis of F via collapsing
++ SAL B                    B        # note eclipsis of P via collapsing
++ SAL CHÉADFAÍ--$          K*TV     # exception to FAÍ$, (bréag|do|mí)
++ SAL CHEARCH--            K*R*     # epenthetic vowel, chearchaill only
++ SAL CEARCH--             K*R*     # epenthetic vowel, g?cearchaill only
++ SAL CHONF                K*N*V    # epenthetic vowel,no dash=>handles FAI?DH$excepts
++ SAL CONF                 K*N*V    #     "        "    "   "     "       "       "
++ SAL CANBH--              K*N*     # epenthetic vowel, see NBH--, g?canbhás* only
++ SAL CHANBH--             K*N*     # epenthetic vowel, see NBH--, chanbhás* only
++ SAL COLBHA---            K*L*     # epenthetic vowel, see LBH--, g?colbhaí? only
++ SAL CHOLBHA---           K*L*     # epenthetic vowel, see LBH--, cholbhaí? only
++ SAL CURF                 K*RV     # exception to FÁ$, g?curfá(nna) only
++ SAL CHURF                K*RV     # exception to FÁ$, churfá(nna) only
++ SAL CH                   K        # OK
++ SAL C                    K
++ SAL DHORCH--             K*R*     # epenthetic vowel, dorcha root only
++ SAL DORCH--              T*R*     # epenthetic vowel, dorcha root only
++ SAL DHEARF               Y*R*     # epenthetic vowel,init only, no dash=>FAÍ except
++ SAL DEARF                T*R*     # epenthetic vowel,initial only (nd- done b4)
++ SAL DHEIRF-              Y*R*     # epenthetic vowel, initial only
++ SAL DEIRF-               T*R*     # epenthetic vowel, (leas)?deirf* only
++ SAL DHOIL(BF)-           K*L*     # epenthetic,see LBH--,initial only,dhoil(fe|bh)*
++ SAL DOIL(BF)-            T*L*     # epenthetic, see LBH--, "      "  (nd- done b4)
++ SAL DHIFEAR              Y*V*R    # exception to FEAR$, ^dhifear$ only
++ SAL DIFEAR               T*V*R    # exception to FEAR$, ^difear$ only (nd- b4)
++ SAL DH$                  _        # [aáu]dh+most [io]dh done b4,[eéíóú]dh done here
++ SAL DH(AÁOÓUÚ)-          K        # athdhúchas, buídhonn, comhdháil, etc.
++ SAL DH(EÉIÍ)-            Y        # athdhéan, caordhearg, cinedheighilt, etc.
++ SAL DHL(AUÚ)--           K        # comhdhlúthaigh, ^dhl-  only
++ SAL DHL(EIÍ)--           Y        # (mí|neamh)dhl(istean|eath|íthiú), ^dhl  only
++ SAL DHR(AÁOÓUÚ)--        K        # *dhroim,marbhdhra*,*dhr[áu]ma, ^dhr only
++ SAL DHR(ÉEIÍ)--          Y        # *dhreach,feirdhris,*dhréacht,*dhreasacht,^dhr
++ SAL D                    T        # note eclipsis of T via collapsing
++ SAL EAFAR--$             *V       # geafar, meafar only, FAR$ exception
++ SAL EOFAR--$             *        # silent verb ending, exception to OFAR$ except!
++ SAL EILBH--              *L*      # epenthetic vowel, see LBH-- exception below
++ SAL EIDH(EI)-            *        # augments IDH rule,eidheann,teidheach,meidhir,etc
++ SAL EOMH(FT)---          *        # leomh[ft]- only, exception to -omh rule
++ SAL E                    *
++ SAL ÉARBH--              *R       # epenthetic exception, géarbh- only
++ SAL ÉARM-                *R       # epenthetic exception, éarmh+ téarma root only
++ SAL ÉARG-                *R       # epenthetic exception, éargh+(lán)?léargas only
++ SAL ÉIRG-                *R       # epenthetic exception, éirgh+ ailléirge only
++ SAL ÉIRBH--              *R       # epenthetic except. léirbhreith*, spéirbhean only
++ SAL ÉALBH--              *L       # béalbhach only, exception to ALBH
++ SAL ÉAFÁ                 *V*      # éafá only, exception to FÁ$
++ SAL É                    *
++ SAL FHAIRCH--            *R*      # epenthetic vowel, fhairch* only
++ SAL FAIRCH--             V*R*     # epenthetic vowel, (bh)?fairch* only
++ SAL FHOIRF-              *R*      # epenthetic vowel, foirfe root only
++ SAL FOIRF-               V*R*     # epenthetic vowel, initial (bh)?foirf* only
++ SAL FHONNMH--            *N*      # epenthetic vowel, see NMH--, fhonnmhai?r* only
++ SAL FONNMH--             V*N*     #    "         "     "    ", (bh)?fonnmhai?r* only
++ SAL FHOILMH--            *L*      # epenthetic vowel, see LMH--, fhoilmhe only
++ SAL FOILMH--             V*L*     # epenthetic vowel, see LMH--, (bh)?foilmhe only
++ SAL FHOLMH--             *L*      # epenthetic vowel, see LMH--, fholmh* only
++ SAL FOLMH--              V*L*     # epenthetic vowel, see LMH--, (bh)?folmh* only
++ SAL FEADH^$              V*       # exception to verb ending below, eclipsis by luck
++ SAL FEAR^$               V*R      #     "      "   "     "     "        "     "   " 
++ SAL FINN^$               V*N      #     "      "   "     "     "        "     "   " 
++ SAL FEÁ^$                V*       #     "      "   "     "     "        "     "   " 
++ SAL FAÍ^$                V*       #     "      "   "     "     "        "     "   " 
++ SAL FÍ^$                 V*       #     "      "   "     "     "        "     "   " 
++ SAL FAIDH----$           _        # silent 'f' in verb ending
++ SAL FADH---$             _        #   "     "   "   "    "
++ SAL FIDH---$             _        #   "     "   "   "    "
++ SAL FEADH----$           _        #   "     "   "   "    "    
++ SAL FEAR---$             _        #   "     "   "   "    "    
++ SAL FAR--$               _        #   "     "   "   "    "
++ SAL FINN---$             _        #   "     "   "   "    "    
++ SAL FAINN----$           _        #   "     "   "   "    "    
++ SAL FÁ-$                 _        #   "     "   "   "    " 
++ SAL FEÁ--$               _        #   "     "   "   "    " 
++ SAL FAÍ--$               _        #   "     "   "   "    "
++ SAL FÍ-$                 _        #   "     "   "   "    "
++ SAL FAIMI(DS)-----$      _        #   "     "   "   "    "  (no exceptions)
++ SAL FIMI(DS)----$        _        #   "     "   "   "    "  (no exceptions)
++ SAL FAIDÍS-----$         _        #   "     "   "   "    "  (no exceptions)
++ SAL FIDÍS----$           _        #   "     "   "   "    "  (no exceptions)
++ SAL FH                   _        # always silent 
++ SAL F                    V
++ SAL GHAINMH--            K*N*     # epenthetic vowel,see NMH--,^ghainmh* only
++ SAL GAINMH--             K*N*     # epenthetic vowel,see NMH--,^gainmh* only, ng- b4
++ SAL GHEALLMH--           Y*L*     # epenthetic vowel,see LMH--,gheallmhar only
++ SAL GEALLMH--            K*L*     # epenthetic vowel,see LMH--,geallmhar only
++ SAL GLAFADH              KL*V*    # exception to FADH$, not glafarnach
++ SAL GHLAFADH             KL*V*    # exception to FADH$ 
++ SAL GLAFAIDH             KL*V*    # exception to FAIDH$, not glafaire
++ SAL GHLAFAIDH            KL*V*    # exception to FAIDH$ 
++ SAL GH$                  _        # [aióu]gh,most ogh done b4,[eáéíú]gh all terminal
++ SAL GH(AÁOÓUÚ)-          K        # bobghaiste, deoirghás, soghonta, etc.
++ SAL GH(EÉIÍ)-            Y        # athghin, luasghéaraigh, etc.
++ SAL GHL(AÁOÓUÚ)--        K        # ardghlórach, folúsghlantóir, etc.
++ SAL GHL(EÉI)--           Y        # comhghléas, comhghleacaí, scoiltghleann, etc.
++ SAL GHR(AÁOÓUÚ)--        K        # tírghrá, grianghraf, aoisghrúpa, etc. 
++ SAL GHR(EÉIÍ)--          Y        # idirghréasán, breithghreamannach, etc.
++ SAL GHN(AÁOÓUÚ)--        K        # deasghnáth, neamhghnách, etc.
++ SAL GHN(EÉIÍ)--          Y        # leorgníomh, aonghnéitheach, etc.
++ SAL G                    K        # note eclipsis of C via collapsing
++ SAL H                    H        # between vowels+Faranhaít,forhalla,etc.
++ SAL IARG-                *R       # epenthetic exception, iargúil, tiargáil, etc.
++ SAL IARBH--              *R       # iarbháis, giarbhosca, etc. epenth. exception
++ SAL IDIRBH--             *T*R     # idirbheart, idirbhliain, etc., exception to IRBH
++ SAL IRBHRÚ----           *R       # muirbhrúcht* only, exception to IRBH--
++ SAL IRBHU---             *R       # eochairbhuille,litirbhuama only, except. to next
++ SAL IRBH--               *R*      # *seirbhís, tairbh*, toirbh*, etc. epenthetic
++ SAL IFÍ-$                *V       # exception to FÍ$, ÉIFÍ$ done before
++ SAL INMHE(AÁ)----        *N       # exception to next,ainmheasartha,inmheabhrú, etc.
++ SAL INMHE---             *N*      # epenthetic vowel, inmhe$ only by previous
++ SAL INNMH--              *N*      # epenthetic vowel, fuinnmh-, coinnmhe only
++ SAL IONMHAG----          *N       # exception to next, mionmhagadh only
++ SAL IONMHA---            *N*      # epenthetic vowel, cionmhar only, see NMH--
++ SAL ITHFH(AEIOUÁÉÍÓÚ)--- *H       # cithfholc*,crithfhuacht,frith* only- see next
++ SAL ITH(BCDFGLMNPRST)-   *        # aithris, frith*, etc.  exception to TH->H
++ SAL IDH(BCDFGLMNPRST)-   *        # feidhm, traidhfil, oidhre, etc.
++ SAL IGH(CDEFILNRST)-     *        # foighne,caighdeán,oighrigh,oighear,feighil,etc.
++ SAL I                    *
++ SAL ÍORM-                *R       # epenthetic exception, díorma, fíor- only
++ SAL ÍOMH(BCDFGLMNPRST)--- *       # (pr|r|l|sn|gn)íomh- only, exceptions to omh-
++ SAL ÍTHS-                *        # clíthseach only (no excp. for díthreabh, etc.)
++ SAL Í                    *
++ SAL J                    T        # initial j, diosc-jacaí only; bit like slender d
++ SAL K                    K        # karaté only
++ SAL LEANBH--             L*N*     # epenthetic vowel, (ucht)?leanbh(aois)?,see NBH--
++ SAL LINBH--              L*N*     # epenthetic vowel, (ucht)?linbh only, see NBH--
++ SAL LMH--                L        # feallmharú, etc., epenth. exception
++ SAL LBH--                L        # uaillbhreas, etc., epenth. exception
++ SAL LGH--                L        # timpeallghearr, etc., epenth. exception
++ SAL L(BGM)-              L*       # epenthetic vowel, see also ULCH--
++ SAL L                    L
++ SAL MORFAÍ--$            M*RV     # exception to silent FAÍ$
++ SAL MBANBH^$             M*N*V    # epenthetic vowel, see NBH--, not -arún
++ SAL MBAINBH^$            M*N*V    # epenthetic vowel, see NBH--
++ SAL MB^                  M        # eclipsis
++ SAL MHARF-               V*R*     # epenthetic vowel
++ SAL MARF-                M*R*     # epenthetic vowel, initial only
++ SAL MHODH                V*       # ODH exception, usually initial
++ SAL MODH                 M*       #  "     "     ,   "       "
++ SAL MH                   V        # includes mh$,/w/,/v/ + see UMH
++ SAL M                    M
++ SAL NAFAÍ--              N*V      # exception to FAÍ$, snafaí only
++ SAL NNARB-               N*R      # exception to RB epenthetic, ionnarb* only
++ SAL NNEALBH--            N*L      # exception to ALBH epenthetic, coinnealbhá only
++ SAL NDORCH--             N*R*     # epenthetic vowel, see DORCH--
++ SAL NDEARF-              N*R*     # epenthetic vowel, see DEARF-
++ SAL NDEIRF-              N*R*     # epenthetic vowel, see DEIRF-
++ SAL NDOIL(BF)-           N*L*     # epenthetic vowel, see DOIL(BF)-
++ SAL NDIFEAR              N*V*R    # exception to FEAR$, ^ndifear$ only
++ SAL NGAINMH--            N*N*     # epenthetic vowel, see GAINMH--
++ SAL NGEALLMH--           N*L*     # epenthetic vowel, see GEALLMH-
++ SAL NGLAFADH             NL*V*    # exception to FADH$, ^nglafadh$ only
++ SAL NGLAFAIDH            NL*V*    # exception to FAIDH$, ^nglafaidh$ only
++ SAL NCHA(ÍS)----         N*       # epenthetic vowel, *sh?eancha(ís)*,ionchas only
++ SAL NCHAIRD------        N        # exception to next, daonchaird* only
++ SAL NCHAI(RS)-----       N*       # epenth. tionchair*, ionchais, *sh?eanchai*, etc.
++ SAL NCHAITHE-------      N*       #     "        "  , sh?eanchaithe, not seanchaite
++ SAL N(DG)^               N        # eclipsis
++ SAL NMH--                N        # exception to N(BM)-, pianmhar, onnmhaire, etc. 
++ SAL NBH--                N        #    "       "   ", aonbheannach, bunbhrat, etc.
++ SAL N(BM)-               N*       # epenthetic vowel, binb, ainm, etc.
++ SAL N                    N
++ SAL OFAR--$              *V       # exception to FAR$, EOFAR done b4
++ SAL OIRCH--              *R*      # epenthetic vowel, t?oirch* only
++ SAL OCALBH--             *K*L     # exception to ALBH - focalbhá* only
++ SAL ORBHÁ---             *R*      # epenthetic vowel, forbhás only
++ SAL ONNCHA---            *N*      # epenthetic vowel   fionncha, Donncha only
++ SAL OMHARB-              *R       # exception to epenth. R(BFGM)-, comharba* only
++ SAL OMH(BCDFGLMNPRST)-   *        # comh-, Domhnach, etc. (several excpts b4 this)
++ SAL OTH(BCDGLMNPRS)-     *        # cothrom, baothchaint, gaothscáth, etc.
++ SAL ODHAO----            *        # fodhao* only, exception to next
++ SAL ODH(ACLNR)-          *        # bodhrán,modhnaigh,todhchaí,fodhla,bodhar etc.
++ SAL OGHRÚP-----          *        # foghrúpa, this and next few are OGH->* excepts.
++ SAL OGHLUA-----          *        # so/doghluaiste* only
++ SAL OGHAF----            *        # doghafa only
++ SAL OGH(AÁBCDFGLMNPRST)- *        # ogham, foghlaim, boghdóir, toghchán, etc.
++ SAL O                    *
++ SAL ÓR(GM)-              *R       # epenthetic exception, (for)?th?órmach, órga,etc.
++ SAL ÓGH                  *        # ógha?$ only
++ SAL Ó                    *
++ SAL PH                   V        # OK
++ SAL P                    B
++ SAL QU                   KV       # ^quinín$, ^quarto$ only
++ SAL RANFAÍ--             R*NV     # exception to silent FAÍ$, -chuaranfaí only
++ SAL RAFAÍ--              R*V      # exception to silent FAÍ$, all *graf-
++ SAL RRBHA---             R*       # epenthetic vowel, cearrbh* only, no carrbhuama
++ SAL REALMH--             R*L*     # epenthetic vowel, see LMH--, trealmh* only
++ SAL RÍFEAR^$             R*V*R    # exception to FEAR$, not athrífear!
++ SAL ROMH(FT)---          R*       # promh[ft]- only, exception to -omh rule
++ SAL RFEAN----            R*       # epenthetic vowel, (be|se|ga)irfean only
++ SAL RFIN---$             R*       # epenthetic vowel, same words as previous
++ SAL RBH--                R        # cíorbhuí, aerbhrat, etc., epenth. exception
++ SAL RMH--                R        # iarmhar, léirmheas, etc., epenth. exception
++ SAL RGH--                R        # daorghalar, etc., epenth. exception
++ SAL RBO--                R        # cosarbolg only, epenth. exception
++ SAL R(BGM)-              R*       # epenthetic vowel
++ SAL R                    R
++ SAL SHORCH--             H*R*     # epenthetic vowel, sorcha root only
++ SAL SORCH--              S*R*     # epenthetic vowel, sorcha root only
++ SAL SHOILBH--            H*L*     # epenthetic, see LBH--
++ SAL SOILBH--             S*L*     # epenthetic, see LBH--
++ SAL SH                   H        # OK
++ SAL S                    S
++ SAL TALMH--              T*L*     # epenthetic vowel, see LMH--, talmhaigh only
++ SAL THALMH--             H*L*     # epenthetic vowel, see LMH--,    "       "
++ SAL TINF(EI)-            T*NV     # exception to F(EA|I)DH$, d?tinf(ea|i)dh only
++ SAL THINF(EI)-           H*NV     # exception to F(EA|I)DH$, thinf(ea|i)dh only
++ SAL TAFA-                T*V      # exception to FAINN$, d?tafainn only
++ SAL THAFA-               H*V      # exception to FAINN$, thafainn only
++ SAL TSORCH--             T*R*     # epenthetic vowel, see SORCH--
++ SAL TSOILBH--            T*L*     # epenthetic vowel, see SOILBH--
++ SAL TS^                  T        # prefix-t
++ SAL TH$                  _        # no exceptions
++ SAL TH                   H
++ SAL T                    T
++ SAL UFA(ÍR)--$           *V       # exception to FAR$, brufar/[cr]ufaí only
++ SAL UARG-                *R       # epenthetic exception, fuarga*, tuargain only
++ SAL UAIRG-               *R       # epenthetic exception, tuairgn* only
++ SAL UARBH--              *R       # epenthetic exception, fuarbh*, cuarbh* only 
++ SAL UALGA--              *L       # epenthetic exception, dualgas only
++ SAL ULLMH--              *L*      # epenthetic vowel, see LMH--
++ SAL UMH                  *        # cumhacht, umhlaíocht, ciumhais, except. to MH->V
++ SAL UTH(BCDGLMNPR)-      *        # sruth*, guthphost only, TH->H exception
++ SAL ULCH--               *L*      # epenth. vowel,ulcha,[tm]ulchán,amhulchach only
++ SAL URCH(AÓ)---          *R*      # epenthetic vowel, urchar, urchall, urchóid, etc.
++ SAL UDH                  *        # mudh* only (literary)
++ SAL UGH                  *        # brugh* only (literary)
++ SAL U                    *
++ SAL ÚIRG-                *R       # epenthetic exception, liotúirg* only, see RG
++ SAL ÚTH(BCDFLPR)-        *        # lúthchleasa, dúthracht, etc. - TH->H exception
++ SAL Ú                    *
++ SAL V                    V
++ SAL W                    V        # wigwam only
++ SAL X(AEÉIÍ)-^           S        # xileafón, etc.
++ SAL X^                   *KS      # x-gha* only
++ SAL X                    KS       # Marxach only
++ SAL Y                    Y        # yóyó only
++ SAL Z                    S        # zú, puzal, etc.
diff --git a/runtime/spell/sv/sv_SE.diff b/runtime/spell/sv/sv_SE.diff
index 859b225..3dfc515 100644
--- a/runtime/spell/sv/sv_SE.diff
+++ b/runtime/spell/sv/sv_SE.diff
@@ -1,16 +1,13 @@
 *** sv_SE.orig.aff	Wed Aug 31 21:00:19 2005
---- sv_SE.aff	Wed Aug 31 21:02:53 2005
+--- sv_SE.aff	Fri Sep 30 14:09:19 2005
 ***************
 *** 6,7 ****
---- 6,25 ----
+--- 6,22 ----
   
 + FOL  ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ
 + LOW  ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ
 + UPP  ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ
 + 
-+ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¿
-+ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
-+ 
 + MAP 9
 + MAP aàáâãäå
 + MAP eèéêë
@@ -28,7 +25,7 @@
   
 ! SFX  C  Y  16
   SFX  C  0  t  [aeiouyåäöé]
---- 33,35 ----
+--- 30,32 ----
   
 ! SFX  C  Y  15
   SFX  C  0  t  [aeiouyåäöé]
@@ -37,4 +34,108 @@
   SFX  C  en nets en
 - SFX  C  0  net  nets [^e]n
   SFX  C  0  nets  [^e]n
---- 48,49 ----
+--- 45,46 ----
+***************
+*** 427 ****
+--- 441,541 ----
+  SFX  T  el  la  el
++ 
++ # soundslike mapping from Aspell
++ # swedish_phonet.dat - Swedish phonetic transformation rules for aspell
++ # Copyright (C) 2000  Martin Norbäck  <d95mback@dtek.chalmers.se>
++ # distributed under GNU GPL
++ # version 0.2
++ 
++ SAL &	&
++ SAL @	@
++ SAL ANG(EIYÄÖ)-^	ANI	# förledet an- ska inte bli @-ljud
++ SAL AGNO6	AKNO	# agnostiker osv.
++ SAL AG(IE)-6	AK	# vokal+g(ie) ger ej j-ljud
++ SAL A	A
++ SAL BB-<	_
++ SAL B	P
++ SAL CCO-	K	# broccoli, piccolo
++ SAL CC	KS	# successiv, access, succé
++ SAL CH	&	# choklad osv.
++ SAL CK	K	# ck -> k som vanligt
++ SAL C(EIYÄÖ)-<	S	# c + mjuk vokal -> s
++ SAL C	K	# c + annat -> k
++ SAL DJ(UÄÖ)-	I	# djungel, djävel, adjö
++ SAL DD-	_
++ SAL D	T
++ SAL EG(IE)-6	EK	# vokal+g(ie) ger ej j-ljud
++ SAL E	E
++ SAL É	E
++ SAL FF	F
++ SAL F	F
++ SAL G(EIYÄÖ)-3	I	# g+mjuk vokal ger j-ljud
++ SAL GG6	K
++ SAL GN	@N	# ugn, lugn...
++ SAL G	K
++ SAL H(AOUÅEIYÄÖ)-^	H	# h i början av ord hörs
++ SAL H(AUOÅEIYÄÖ)-	_	# annars stumt framför vokal
++ SAL HJ	I	# hj->j (hjärta osv.)
++ SAL H	H
++ SAL IG(IE)-6	IK	# vokal+g(ie) ger ej j-ljud
++ SAL I	I
++ SAL J	I
++ SAL K(EIYÄÖ)-^	&	# k+mjuk vokal ger sje-ljud
++ SAL KJ	&	# kjol
++ SAL K	K
++ SAL LJU-	I	# ljuga, ljus
++ SAL LL-	_
++ SAL L	L
++ SAL MM-	_
++ SAL M	M
++ SAL NG6	@
++ SAL NN-	_
++ SAL N	N
++ SAL ORIGI8	ORKI	# specialfall
++ SAL OG(IE)-6	OK	# vokal+g(ie) ger ej j-ljud
++ SAL O	O
++ SAL PROJEKT	PRO&EKT	# specialfall
++ SAL PSALT<	SALT	# specialfall
++ SAL PSALM<	SALM	# specialfall
++ SAL PP-	_
++ SAL P	P
++ SAL Q	K
++ SAL RGI$6	RGI	# inget j i slutet
++ SAL RGA$6	RIA	# här är det däremot j (arga,färga)
++ SAL RGE$6	RIE	# här också (Norge, överge)
++ SAL RGS$	RIS	# rgs i slutet
++ SAL RG$	RI	# rg i slutet
++ SAL RD	T	# "blött" d
++ SAL RN	N	# "blött" n
++ SAL RT	T	# "blött" t
++ SAL RLD	T	# värld
++ SAL RL	L	# "blött" l
++ SAL RS	&	# sje-ljud (fars, gärsgård)
++ SAL RR-	_
++ SAL R	R
++ SAL SS-	_
++ SAL SCHIZ6	SKITS	# specialfall
++ SAL SCH6	&
++ SAL SKJ	&	# skjorta, skjuta
++ SAL SJ	&	# sje-ljud
++ SAL S	S
++ SAL TION9^	TION	# tionde
++ SAL TION6	&ON	# station osv.
++ SAL TT-	_
++ SAL T	T
++ SAL UG(IE)-6	UK	# vokal+g(ie) ger ej j-ljud
++ SAL U	U
++ SAL V	F
++ SAL W	F
++ SAL X9	KS
++ SAL YG(IE)-6	YK	# vokal+g(ie) ger ej j-ljud
++ SAL Y	I
++ SAL ZZ	TS
++ SAL Z	S
++ SAL ÅTTIO9	OTIO	# specialfall (ej sje-ljud)
++ SAL ÅRTION9	ORTION	# specialfall (r hörs)
++ SAL ÅG(IE)-6	OK	# vokal+g(ie) ger ej j-ljud
++ SAL Å	O
++ SAL ÄG(IE)-6	EK	# vokal+g(ie) ger ej j-ljud
++ SAL Ä	E
++ SAL ÖG(IE)-6	ÖK	# vokal+g(ie) ger ej j-ljud
++ SAL Ö	Ö
diff --git a/runtime/spell/yi/yi.diff b/runtime/spell/yi/yi.diff
index 099488a..015a8fc 100644
--- a/runtime/spell/yi/yi.diff
+++ b/runtime/spell/yi/yi.diff
@@ -6,7 +6,7 @@
 + 999999
   גרונטעלעמענט
   דזשאָבענדיקס
-*** /dev/null	Thu Sep 29 20:06:57 2005
+*** /dev/null	Fri Sep 30 14:15:43 2005
 --- yi.aff	Mon Aug 15 23:06:00 2005
 ***************
 *** 0 ****
diff --git a/src/edit.c b/src/edit.c
index d9bfb2f..e4370fc 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3515,6 +3515,7 @@
 		compl_col = spell_word_start(startcol);
 	    if (compl_col >= (colnr_T)startcol)
 		return FAIL;
+	    spell_expand_check_cap(compl_col);
 	    compl_length = (int)curs_col - compl_col;
 	    compl_pattern = vim_strnsave(line + compl_col, compl_length);
 	    if (compl_pattern == NULL)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 6ff5fc6..c5d1eb0 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1971,7 +1971,9 @@
 	vim_free(padding);
 	pad_size = Columns;
 
-	padding = (int *)alloc(pad_size * sizeof(int));
+	/* Don't give an out-of-memory message here, it would call us
+	 * recursively. */
+	padding = (int *)lalloc(pad_size * sizeof(int), FALSE);
 	if (padding != NULL)
 	    for (i = 0; i < pad_size; i++)
 		padding[i] = gui.char_width;
@@ -2007,10 +2009,10 @@
 	    && (unicodebuf == NULL || len > unibuflen))
     {
 	vim_free(unicodebuf);
-	unicodebuf = (WCHAR *)alloc(len * sizeof(WCHAR));
+	unicodebuf = (WCHAR *)lalloc(len * sizeof(WCHAR), FALSE);
 
 	vim_free(unicodepdy);
-	unicodepdy = (int *)alloc(len * sizeof(int));
+	unicodepdy = (int *)lalloc(len * sizeof(int), FALSE);
 
 	unibuflen = len;
     }
@@ -2730,12 +2732,12 @@
 	dfltbutton = -1;
 
     /* Allocate array to hold the width of each button */
-    buttonWidths = (int *) lalloc(numButtons * sizeof(int), TRUE);
+    buttonWidths = (int *)lalloc(numButtons * sizeof(int), TRUE);
     if (buttonWidths == NULL)
 	return -1;
 
     /* Allocate array to hold the X position of each button */
-    buttonPositions = (int *) lalloc(numButtons * sizeof(int), TRUE);
+    buttonPositions = (int *)lalloc(numButtons * sizeof(int), TRUE);
     if (buttonPositions == NULL)
 	return -1;
 
diff --git a/src/proto/spell.pro b/src/proto/spell.pro
index facbfbc..87261a2 100644
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@@ -19,5 +19,6 @@
 void ex_spelldump __ARGS((exarg_T *eap));
 char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
 int spell_word_start __ARGS((int startcol));
+void spell_expand_check_cap __ARGS((colnr_T col));
 int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp));
 /* vim: set ft=c : */
diff --git a/src/version.h b/src/version.h
index 70e2f4d..85bf690 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 Sep 29)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 29, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 30)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 30, compiled "