Update to newer English spell files,
but without the COMPOUND rules that make suggestions very slow.
diff --git a/runtime/spell/en/en_CA.diff b/runtime/spell/en/en_CA.diff
index 4b83719..7b3f003 100644
--- a/runtime/spell/en/en_CA.diff
+++ b/runtime/spell/en/en_CA.diff
@@ -1,459 +1,238 @@
-*** en_CA.orig.aff 2010-05-15 13:03:47.000000000 +0200
---- en_CA.aff 2010-05-15 13:03:47.000000000 +0200
+*** en_CA.orig.aff 2015-12-30 18:18:20.076952127 +0100
+--- en_CA.aff 2016-01-09 13:15:51.306488848 +0100
***************
-*** 3,4 ****
---- 3,141 ----
+*** 2,18 ****
+ TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ'
+! ICONV 1
+! ICONV ’ '
+ NOSUGGEST !
-+ FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
-+ LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
-+ UPP ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ
-+
-+ MIDWORD '
-+
-+ RARE ?
-+ BAD !
-+
-+ MAP 9
-+ MAP aàáâãäå
-+ MAP eèéêë
-+ MAP iìíîï
-+ MAP oòóôõö
-+ MAP uùúûü
-+ MAP nñ
-+ MAP cç
-+ MAP yÿý
-+ MAP sß
-+
-+ # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-+
-+ SAL AH(AEIOUY)-^ *H
-+ SAL AR(AEIOUY)-^ *R
-+ SAL A(HR)^ *
-+ SAL A^ *
-+ SAL AH(AEIOUY)- H
-+ SAL AR(AEIOUY)- R
-+ SAL A(HR) _
-+ SAL À^ *
-+ SAL Å^ *
-+ SAL BB- _
-+ SAL B B
-+ SAL CQ- _
-+ SAL CIA X
-+ SAL CH X
-+ SAL C(EIY)- S
-+ SAL CK K
-+ SAL COUGH^ KF
-+ SAL CC< C
-+ SAL C K
-+ SAL DG(EIY) K
-+ SAL DD- _
-+ SAL D T
-+ SAL É< E
-+ SAL EH(AEIOUY)-^ *H
-+ SAL ER(AEIOUY)-^ *R
-+ SAL E(HR)^ *
-+ SAL ENOUGH^$ *NF
-+ SAL E^ *
-+ SAL EH(AEIOUY)- H
-+ SAL ER(AEIOUY)- R
-+ SAL E(HR) _
-+ SAL FF- _
-+ SAL F F
-+ SAL GN^ N
-+ SAL GN$ N
-+ SAL GNS$ NS
-+ SAL GNED$ N
-+ SAL GH(AEIOUY)- K
-+ SAL GH _
-+ SAL GG9 K
-+ SAL G K
-+ SAL H H
-+ SAL IH(AEIOUY)-^ *H
-+ SAL IR(AEIOUY)-^ *R
-+ SAL I(HR)^ *
-+ SAL I^ *
-+ SAL ING6 N
-+ SAL IH(AEIOUY)- H
-+ SAL IR(AEIOUY)- R
-+ SAL I(HR) _
-+ SAL J K
-+ SAL KN^ N
-+ SAL KK- _
-+ SAL K K
-+ SAL LAUGH^ LF
-+ SAL LL- _
-+ SAL L L
-+ SAL MB$ M
-+ SAL MM M
-+ SAL M M
-+ SAL NN- _
-+ SAL N N
-+ SAL OH(AEIOUY)-^ *H
-+ SAL OR(AEIOUY)-^ *R
-+ SAL O(HR)^ *
-+ SAL O^ *
-+ SAL OH(AEIOUY)- H
-+ SAL OR(AEIOUY)- R
-+ SAL O(HR) _
-+ SAL PH F
-+ SAL PN^ N
-+ SAL PP- _
-+ SAL P P
-+ SAL Q K
-+ SAL RH^ R
-+ SAL ROUGH^ RF
-+ SAL RR- _
-+ SAL R R
-+ SAL SCH(EOU)- SK
-+ SAL SC(IEY)- S
-+ SAL SH X
-+ SAL SI(AO)- X
-+ SAL SS- _
-+ SAL S S
-+ SAL TI(AO)- X
-+ SAL TH @
-+ SAL TCH-- _
-+ SAL TOUGH^ TF
-+ SAL TT- _
-+ SAL T T
-+ SAL UH(AEIOUY)-^ *H
-+ SAL UR(AEIOUY)-^ *R
-+ SAL U(HR)^ *
-+ SAL U^ *
-+ SAL UH(AEIOUY)- H
-+ SAL UR(AEIOUY)- R
-+ SAL U(HR) _
-+ SAL V^ W
-+ SAL V F
-+ SAL WR^ R
-+ SAL WH^ W
-+ SAL W(AEIOU)- W
-+ SAL X^ S
-+ SAL X KS
-+ SAL Y(AEIOU)- Y
-+ 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 ****
- SFX N e ion e
-! SFX N y ication y
-! SFX N 0 en [^ey]
+! # ordinal numbers
+! COMPOUNDMIN 1
+! # only in compounds: 1th, 2th, 3th
+! ONLYINCOMPOUND c
+! # compound rules:
+! # 1. [0-9]*1[0-9]th (10th, 11th, 12th, 56714th, etc.)
+! # 2. [0-9]*[02-9](1st|2nd|3rd|[4-9]th) (21st, 22nd, 123rd, 1234th, etc.)
+! COMPOUNDRULE 2
+! COMPOUNDRULE n*1t
+! COMPOUNDRULE n*mp
+! WORDCHARS 0123456789
---- 167,170 ----
- SFX N e ion e
-! SFX N y ication y
-! SFX N 0 en [^ey]
+--- 2,161 ----
+ TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ'
+!
+! # ICONV 1
+! # ICONV ’ '
+!
+ NOSUGGEST !
-***************
-*** 40,42 ****
- SFX H y ieth y
-! SFX H 0 th [^y]
+! FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
+! LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
+! UPP ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ
+!
+! MIDWORD '
+!
+! RARE ?
+! BAD %
+!
+! MAP 9
+! MAP aàáâãäå
+! MAP eèéêë
+! MAP iìíîï
+! MAP oòóôõö
+! MAP uùúûü
+! MAP nñ
+! MAP cç
+! MAP yÿý
+! MAP sß
+!
+! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
+!
+! SAL AH(AEIOUY)-^ *H
+! SAL AR(AEIOUY)-^ *R
+! SAL A(HR)^ *
+! SAL A^ *
+! SAL AH(AEIOUY)- H
+! SAL AR(AEIOUY)- R
+! SAL A(HR) _
+! SAL À^ *
+! SAL Å^ *
+! SAL BB- _
+! SAL B B
+! SAL CQ- _
+! SAL CIA X
+! SAL CH X
+! SAL C(EIY)- S
+! SAL CK K
+! SAL COUGH^ KF
+! SAL CC< C
+! SAL C K
+! SAL DG(EIY) K
+! SAL DD- _
+! SAL D T
+! SAL É< E
+! SAL EH(AEIOUY)-^ *H
+! SAL ER(AEIOUY)-^ *R
+! SAL E(HR)^ *
+! SAL ENOUGH^$ *NF
+! SAL E^ *
+! SAL EH(AEIOUY)- H
+! SAL ER(AEIOUY)- R
+! SAL E(HR) _
+! SAL FF- _
+! SAL F F
+! SAL GN^ N
+! SAL GN$ N
+! SAL GNS$ NS
+! SAL GNED$ N
+! SAL GH(AEIOUY)- K
+! SAL GH _
+! SAL GG9 K
+! SAL G K
+! SAL H H
+! SAL IH(AEIOUY)-^ *H
+! SAL IR(AEIOUY)-^ *R
+! SAL I(HR)^ *
+! SAL I^ *
+! SAL ING6 N
+! SAL IH(AEIOUY)- H
+! SAL IR(AEIOUY)- R
+! SAL I(HR) _
+! SAL J K
+! SAL KN^ N
+! SAL KK- _
+! SAL K K
+! SAL LAUGH^ LF
+! SAL LL- _
+! SAL L L
+! SAL MB$ M
+! SAL MM M
+! SAL M M
+! SAL NN- _
+! SAL N N
+! SAL OH(AEIOUY)-^ *H
+! SAL OR(AEIOUY)-^ *R
+! SAL O(HR)^ *
+! SAL O^ *
+! SAL OH(AEIOUY)- H
+! SAL OR(AEIOUY)- R
+! SAL O(HR) _
+! SAL PH F
+! SAL PN^ N
+! SAL PP- _
+! SAL P P
+! SAL Q K
+! SAL RH^ R
+! SAL ROUGH^ RF
+! SAL RR- _
+! SAL R R
+! SAL SCH(EOU)- SK
+! SAL SC(IEY)- S
+! SAL SH X
+! SAL SI(AO)- X
+! SAL SS- _
+! SAL S S
+! SAL TI(AO)- X
+! SAL TH @
+! SAL TCH-- _
+! SAL TOUGH^ TF
+! SAL TT- _
+! SAL T T
+! SAL UH(AEIOUY)-^ *H
+! SAL UR(AEIOUY)-^ *R
+! SAL U(HR)^ *
+! SAL U^ *
+! SAL UH(AEIOUY)- H
+! SAL UR(AEIOUY)- R
+! SAL U(HR) _
+! SAL V^ W
+! SAL V F
+! SAL WR^ R
+! SAL WH^ W
+! SAL W(AEIOU)- W
+! SAL X^ S
+! SAL X KS
+! SAL Y(AEIOU)- Y
+! 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
+!
+! # This is disabled, because if Vim does not support NOCOMPOUNDSUGS giving
+! # suggestions is extremely slow.
+! ## ordinal numbers
+! #COMPOUNDMIN 1
+! ## only in compounds: 1th, 2th, 3th
+! #ONLYINCOMPOUND c
+! ## compound rules:
+! ## 1. [0-9]*1[0-9]th (10th, 11th, 12th, 56714th, etc.)
+! ## 2. [0-9]*[02-9](1st|2nd|3rd|[4-9]th) (21st, 22nd, 123rd, 1234th, etc.)
+! #COMPOUNDRULE 2
+! #COMPOUNDRULE n*1t
+! #COMPOUNDRULE n*mp
+! #NOCOMPOUNDSUGS
+!
+! # WORDCHARS 0123456789
---- 177,179 ----
- SFX H y ieth y
-! SFX H 0 th [^y]
-
+*** en_CA.orig.dic 2015-12-30 18:20:47.803358258 +0100
+--- en_CA.dic 2016-01-08 23:03:52.562085247 +0100
***************
-*** 47,49 ****
- SFX G e ing e
-! SFX G 0 ing [^e]
-
---- 184,186 ----
- SFX G e ing e
-! SFX G 0 ing [^e]
-
-*** en_CA.orig.dic 2010-05-15 13:03:47.000000000 +0200
---- en_CA.dic 2010-05-15 13:03:48.000000000 +0200
+*** 1,25 ****
+ 48929
+! 0/nm
+! 0th/pt
+! 1/n1
+! 1st/p
+! 1th/tc
+! 2/nm
+! 2nd/p
+! 2th/tc
+! 3/nm
+! 3rd/p
+! 3th/tc
+! 4/nm
+! 4th/pt
+! 5/nm
+! 5th/pt
+! 6/nm
+! 6th/pt
+! 7/nm
+! 7th/pt
+! 8/nm
+! 8th/pt
+! 9/nm
+! 9th/pt
+ A/SM
+--- 1,12 ----
+ 48929
+! 0th
+! 1st
+! 2nd
+! 3rd
+! 4th
+! 5th
+! 6th
+! 7th
+! 8th
+! 9th
+ A/SM
***************
-*** 46,48 ****
- R/G
-- S
- easternmost
---- 46,47 ----
-***************
-*** 59,66 ****
- a
-! b/KGDT
- Emmey/M
- baggagemen
-! c/EAS
- antimalarial/S
-- d/AMV
- enveloper/M
---- 58,65 ----
- a
-! probing
-! probed
- Emmey/M
- baggagemen
-! recs
- antimalarial/S
- enveloper/M
-***************
-*** 68,98 ****
- Balearic/M
-! e/FDSM
-! f/BVXT
- Karamazov/M
-! g/VXB
-! h/VEMS
-! i
- Braille/DSGM
-- j/FTV
- transceiver/MS
-! k/FGISE
- promising/YU
-! l/XTJGV
- Emmet/M
-! m/XG
-! n/FKT
-! o
- xviii
- fitting/PSY
-! p/KRT
-! q
-! r/GVTJ
-! s/FK
- fatting
-! t/BGXTJ
- Franciska/M
- oedipal
-! u
-! v/VTK
-! w/JXTGV
- youths
---- 67,94 ----
- Balearic/M
-! fens
- Karamazov/M
-! gens
- Braille/DSGM
- transceiver/MS
-! inking
-! disking
-! conking
-! inks
-! disks
-! conks
- promising/YU
-! lings
- Emmet/M
-! ming
-! pron
- xviii
- fitting/PSY
-! cons
- fatting
-! tings
- Franciska/M
- oedipal
-! vive
-! wens
-! wings
- youths
-***************
-*** 100,103 ****
- x
-! y/F
-! z/JGT
- crumby/RT
---- 96,98 ----
- x
-! zings
- crumby/RT
-***************
-*** 714,715 ****
---- 709,711 ----
- silty/RT
-+ conj.
- conjectural/Y
-***************
-*** 3145,3146 ****
---- 3141,3143 ----
- semester/MS
-+ etc.
- etch/GZSRDJ
-***************
-*** 6190,6191 ****
---- 6187,6190 ----
- Paula/M
-+ coned
-+ cone/MS
- coneflower/M
-***************
-*** 7022,7024 ****
- DA
-- DB
- DC
---- 7021,7022 ----
-***************
-*** 7395,7397 ****
- rec
-! red/YPS
- Eamon/M
---- 7393,7395 ----
- rec
-! red/YPSM
- Eamon/M
-***************
-*** 8388,8390 ****
- slotting
-- ON
- OR
---- 8386,8387 ----
-***************
-*** 9125,9127 ****
- perchance
-- rte
- hastiness/MS
---- 9122,9123 ----
-***************
-*** 10603,10604 ****
---- 10599,10603 ----
- dB/M
-+ dBi
-+ dBm
-+ dBd
- Hewet/M
-***************
-*** 10615,10617 ****
- Garold/M
-- db
- tollhouse/M
---- 10614,10615 ----
-***************
-*** 11017,11019 ****
- hr
-- ht
- MCI/M
---- 11015,11016 ----
-***************
-*** 11609,11611 ****
- demureness/SM
-! nd/A
- MIA
---- 11606,11608 ----
- demureness/SM
-! nd
- MIA
-***************
-*** 13669,13671 ****
- engross/LDRSG
-! hobbit
- certainty/MUS
---- 13666,13668 ----
- engross/LDRSG
-! hobbit/MS
- certainty/MUS
-***************
-*** 14434,14435 ****
---- 14431,14433 ----
- pompom/MS
-+ pompon/M
- Devland/M
-***************
-*** 19265,19267 ****
- bloodstone/M
-! cetera/S
- storm/SGZRDM
---- 19263,19265 ----
- bloodstone/M
-! et cetera/S
- storm/SGZRDM
-***************
-*** 20162,20164 ****
- Hansel/M
-! ring/GZJDRM
- Hansen/M
---- 20160,20162 ----
- Hansel/M
-! ring/GZJDRMS
- Hansen/M
-***************
-*** 26960,26965 ****
- Wisenheimer/M
-! disc/GDM
- horticulturist/SM
- isotropically
-! dish/DG
- disburser/M
---- 26958,26963 ----
- Wisenheimer/M
-! disc/GDMS
- horticulturist/SM
- isotropically
-! dish/DGMS
- disburser/M
-***************
-*** 28157,28158 ****
---- 28155,28157 ----
- pneumonia/MS
-+ pneumonic
- Socratic/S
-***************
-*** 34999,35001 ****
- claque/MS
-- etc
- Chad/M
---- 34998,34999 ----
-***************
-*** 36707,36708 ****
---- 36705,36707 ----
- Moody/M
-+ Moolenaar/M
- Bresenham/M
-***************
-*** 40455,40457 ****
- proneness/MS
-! transl
- Conchita/M
---- 40454,40456 ----
- proneness/MS
-! transl.
- Conchita/M
-***************
-*** 50272,50273 ****
---- 50271,50273 ----
- Dutch/M
-+ Farsi
- Sharon/M
-***************
-*** 52565,52567 ****
- hatchery/MS
-! vim/SM
- compatriot/MS
---- 52565,52568 ----
- hatchery/MS
-! Vim/SM
-! vim/?
- compatriot/MS
-***************
-*** 53490,53491 ****
---- 53491,53493 ----
- unsearchable
-+ searchable
- felicitous/IY
-***************
-*** 62341 ****
---- 62343,62354 ----
- data/M
-+ et al.
-+ the the/!
-+ and and/!
-+ a a/!
-+ a an/!
-+ an a/!
-+ an an/!
-+ PayPal
-+ Google
-+ e.g.
-+ TCP\/IP
+*** 48930 ****
+--- 48917,48927 ----
+ zymurgy/M
++ a a/%
++ a an/%
++ a the/%
++ an a/%
++ an an/%
++ an the/%
++ and and/%
++ the a/%
++ the an/%
++ the the/%