Merge remote-tracking branch 'vim/master'

2026-06-07 15:37:14 +02:00 · 2016-01-09 15:46:00 -08:00
parent d161d7b64a 28fb79db6b
commit 523f23de6e
44 changed files with 13776 additions and 4978 deletions
@@ -515,12 +515,15 @@ startup file (usually "~/.vimrc" on Unix):
 ==============================================================================
 9. Dynamic loading					*tcl-dynamic*

-On MS-Windows the Tcl library can be loaded dynamically.  The |:version|
-output then includes |+tcl/dyn|.
+On MS-Windows and Unix the Tcl library can be loaded dynamically.  The
+|:version| output then includes |+tcl/dyn|.

-This means that Vim will search for the Tcl DLL file only when needed.  When
-you don't use the Tcl interface you don't need it, thus you can use Vim
-without this DLL file.
+This means that Vim will search for the Tcl DLL or shared library file only
+when needed.  When you don't use the Tcl interface you don't need it, thus you
+can use Vim without this file.
+
+
+MS-Windows ~

 To use the Tcl interface the Tcl DLL must be in your search path.  In a
 console window type "path" to see what directories are used.
@@ -529,5 +532,12 @@ The name of the DLL must match the Tcl version Vim was compiled with.
 Currently the name is "tcl86.dll".  That is for Tcl 8.6.  To know for sure
 edit "gvim.exe" and search for "tcl\d*.dll\c".

+
+Unix ~
+
+The 'tcldll' option can be used to specify the Tcl shared library file instead
+of DYNAMIC_TCL_DLL file what was specified at compile time.  The version of
+the shared library must match the Tcl version Vim was compiled with.
+
 ==============================================================================
 vim:tw=78:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.4.  Last change: 2016 Jan 03
+*options.txt*	For Vim version 7.4.  Last change: 2016 Jan 09


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4958,13 +4958,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	reset this option. |-u| |--noplugin|

 						*'luadll'*
-'luadll' 		string	(default empty)
+'luadll' 		string	(default depends on the build)
 			global
-			{not in Vi} {only for Unix}
+			{not in Vi}
 			{only available when compiled with the |+lua/dyn|
 			feature}
-	Specifies the path of the Lua shared library instead of DYNAMIC_LUA_DLL
-	what was specified at compile time.
+	Specifies the name of the Lua shared library. The default is
+	DYNAMIC_LUA_DLL, which was specified at compile time.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

@@ -5433,7 +5433,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Negative or zero value means no thread scheduling.

 							*'nrformats'* *'nf'*
-'nrformats' 'nf'	string	(default "octal,hex")
+'nrformats' 'nf'	string	(default "bin,octal,hex")
 			local to buffer
 			{not in Vi}
 	This defines what bases Vim will consider for numbers when using the
@@ -5447,6 +5447,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	hex	If included, numbers starting with "0x" or "0X" will be
 		considered to be hexadecimal.  Example: Using CTRL-X on
 		"0x100" results in "0x0ff".
+	bin	If included, numbers starting with "0b" or "0B" will be
+		considered to be binary.  Example: Using CTRL-X on
+		"0b1000" subtracts one, resulting in "0b0111".
 	Numbers which simply begin with a digit in the range 1-9 are always
 	considered decimal.  This also happens for numbers that are not
 	recognized as octal or hex.
@@ -5701,13 +5704,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	this doesn't work when $INCL contains a comma or white space.

 						*'perldll'*
-'perldll' 		string	(default empty)
+'perldll' 		string	(default depends on the build)
 			global
-			{not in Vi} {only for Unix}
+			{not in Vi}
 			{only available when compiled with the |+perl/dyn|
 			feature}
-	Specifies the path of the Perl shared library instead of
-	DYNAMIC_PERL_DLL what was specified at compile time.
+	Specifies the name of the Perl shared library. The default is
+	DYNAMIC_PERL_DLL, which was specified at compile time.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

@@ -5838,24 +5841,24 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|ins-completion-menu|.

 						*'pythondll'*
-'pythondll' 		string	(default empty)
+'pythondll' 		string	(default depends on the build)
 			global
-			{not in Vi} {only for Unix}
+			{not in Vi}
 			{only available when compiled with the |+python/dyn|
 			feature}
-	Specifies the path of the Python 2.x shared library instead of
-	DYNAMIC_PYTHON_DLL what was specified at compile time.
+	Specifies the name of the Python 2.x shared library. The default is
+	DYNAMIC_PYTHON_DLL, which was specified at compile time.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

 						*'pythonthreedll'*
-'pythonthreedll'	string	(default empty)
+'pythonthreedll'	string	(default depends on the build)
 			global
-			{not in Vi} {only for Unix}
+			{not in Vi}
 			{only available when compiled with the |+python3/dyn|
 			feature}
-	Specifies the path of the Python 3 shared library instead of
-	DYNAMIC_PYTHON3_DLL what was specified at compile time.
+	Specifies the name of the Python 3 shared library. The default is
+	DYNAMIC_PYTHON3_DLL, which was specified at compile time.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

@@ -6079,13 +6082,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The 'rightleft' option must be set for 'rightleftcmd' to take effect.

 						*'rubydll'*
-'rubydll' 		string	(default empty)
+'rubydll' 		string	(default: depends on the build)
 			global
-			{not in Vi} {only for Unix}
+			{not in Vi}
 			{only available when compiled with the |+ruby/dyn|
 			feature}
-	Specifies the path of the Ruby shared library instead of
-	DYNAMIC_RUBY_DLL what was specified at compile time.
+	Specifies the name of the Ruby shared library. The default is
+	DYNAMIC_RUBY_DLL, which was specified at compile time.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

@@ -7570,6 +7573,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Resetting this option is useful when using a ":tag" command in a
 	mapping which should not change the tagstack.

+						*'tcldll'*
+'tcldll' 		string	(default depends on the build)
+			global
+			{not in Vi}
+			{only available when compiled with the |+tcl/dyn|
+			feature}
+	Specifies the name of the Tcl shared library. The default is
+	DYNAMIC_TCL_DLL, which was specified at compile time.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
+
 						*'term'* *E529* *E530* *E531*
 'term'			string	(default is $TERM, if that fails:
 				      in the GUI: "builtin_gui"
@@ -914,6 +914,7 @@ Short explanation of each option:		*option-list*
 'tagrelative'	  'tr'	    file names in tag file are relative
 'tags'		  'tag'     list of file names used by the tag command
 'tagstack'	  'tgst'    push tags onto the tag stack
+'tcldll'		    name of the Tcl dynamic library
 'term'			    name of the terminal
 'termbidi'	  'tbidi'   terminal takes care of bi-directionality
 'termencoding'	  'tenc'    character encoding used by the terminal
@@ -1386,6 +1386,14 @@ the item name.  Case is always ignored.

 The Hunspell feature to use three arguments and flags is not supported.

+							*spell-NOCOMPOUNDSUGS*
+This item indicates that using compounding to make suggestions is not a good
+idea.  Use this when compounding is used with very short or one-character
+words.  E.g. to make numbers out of digits.  Without this flag creating
+suggestions would spend most time trying all kind of weird compound words.
+
+	NOCOMPOUNDSUGS ~
+
 							*spell-SYLLABLE*
 The SYLLABLE item defines characters or character sequences that are used to
 count the number of syllables in a word.  Example:
@@ -1346,6 +1346,10 @@ if exists("&rubydll")
  call append("$", "rubydll\tname of the Ruby dynamic library")
  call <SID>OptionG("rubydll", &rubydll)
 endif
+if exists("&tcldll")
+  call append("$", "tcldll\tname of the Tcl dynamic library")
+  call <SID>OptionG("tcldll", &tcldll)
+endif

 set cpo&vim

@@ -1,5 +1,5 @@
 *** en_AU.orig.aff	2010-05-15 13:03:47.000000000 +0200
--- en_AU.aff	2015-12-30 19:08:16.916527503 +0100
+--- en_AU.aff	2016-01-09 13:15:38.426627871 +0100
 ***************
 *** 7,9 ****
  SET ISO8859-1
@@ -148,7 +148,8 @@
 ! 
  REP 24
 ***************
-*** 34,53 ****
+*** 33,53 ****
+  REP ght t
  PFX A Y 2
 ! PFX A 0 re [^e] 
 ! PFX A 0 re- e 
@@ -169,7 +170,25 @@
  PFX E Y 1
 ! PFX E 0 dis . 
  PFX F Y 5
--- 172,191 ----
+--- 171,208 ----
+  REP ght t
+ 
+ # 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 ,
+ ## 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 (*:)
+ #COMPOUNDRULE (*{}
+ #NOCOMPOUNDSUGS
+ 
+ # WORDCHARS 0123456789
+ 
  PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -587,7 +606,7 @@
  SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
  SFX T 0 est [aeiou]y
--- 195,589 ----
+--- 212,606 ----
  PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
  PFX K Y 1
@@ -1671,7 +1690,7 @@
 ! SFX 3 0 ist's [aeioubp]y 
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
--- 596,1305 ----
+--- 613,1322 ----
  SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2383,20 +2402,30 @@
 ! # a few more for consistency
 ! COMMON five six seven eight nine ten hundred thousand
 *** en_AU.orig.dic	2010-05-15 13:03:48.000000000 +0200
--- en_AU.dic	2015-12-30 19:07:42.620898655 +0100
+--- en_AU.dic	2016-01-08 23:03:18.342461841 +0100
 ***************
 *** 1,2 ****
 ! 45654
  AA
--- 1,2 ----
+--- 1,12 ----
 ! 45653
+! 0th
+! 1st
+! 2nd
+! 3rd
+! 4th
+! 5th
+! 6th
+! 7th
+! 8th
+! 9th
  AA
 ***************
 *** 912,914 ****
  Alaska/M
 ! al/AY
  albacore/MS
--- 912,914 ----
+--- 922,924 ----
  Alaska/M
 ! really
  albacore/MS
@@ -2405,10 +2434,10 @@
  bozo/SM
 - b/pb
  bpi
--- 4885,4886 ----
+--- 4895,4896 ----
 ***************
 *** 4921,4922 ****
--- 4920,4922 ----
+--- 4930,4932 ----
  Brahms
 + Bram/M
  braid/DGS
@@ -2417,22 +2446,22 @@
  cad/ZSM
 - c/aE
  CAE
--- 5753,5754 ----
+--- 5763,5764 ----
 ***************
 *** 8535,8537 ****
  coniferous
 - conj
  conjectural
--- 8534,8535 ----
+--- 8544,8545 ----
 ***************
 *** 8544,8545 ****
--- 8542,8544 ----
+--- 8552,8554 ----
  conjunctiva/MS
 + conj.
  conjunctive/S
 ***************
 *** 10288,10289 ****
--- 10287,10291 ----
+--- 10297,10301 ----
  dB/M
 + dBi
 + dBm
@@ -2443,10 +2472,10 @@
  DNA
 - d/o
  DOB
--- 11783,11784 ----
+--- 11793,11794 ----
 ***************
 *** 12468,12469 ****
--- 12469,12471 ----
+--- 12479,12481 ----
  Dutch/5m
 + Farsi
  Dutchwomen/M
@@ -2455,19 +2484,19 @@
  dystrophy/M
 - e
  ea
--- 12518,12519 ----
+--- 12528,12529 ----
 ***************
 *** 12792,12794 ****
  e.g.
 - e.g..
  egad
--- 12793,12794 ----
+--- 12803,12804 ----
 ***************
 *** 13779,13781 ****
  estuary/MS
 ! et
  ETA
--- 13779,13782 ----
+--- 13789,13792 ----
  estuary/MS
 ! et cetera
 ! et al.
@@ -2477,7 +2506,7 @@
  fjord/SM
 ! f/K
  flab/2zZM
--- 15297,15299 ----
+--- 15307,15309 ----
  fjord/SM
 ! pref
  flab/2zZM
@@ -2486,19 +2515,19 @@
  FYI
 - g/7
  gabardine/SM
--- 16481,16482 ----
+--- 16491,16492 ----
 ***************
 *** 18599,18601 ****
  HDTV
 - h/E
  headache/SM
--- 18599,18600 ----
+--- 18609,18610 ----
 ***************
 *** 19214,19216 ****
  Hobbes
 ! hobbit
  hobble/RGSD
--- 19213,19215 ----
+--- 19223,19225 ----
  Hobbes
 ! hobbit/MS
  hobble/RGSD
@@ -2507,34 +2536,34 @@
  jive/DSMG
 - j/k
  jnr.
--- 21790,21791 ----
+--- 21800,21801 ----
 ***************
 *** 22125,22127 ****
  kcal
 - k/E
  Keane
--- 22123,22124 ----
+--- 22133,22134 ----
 ***************
 *** 22606,22608 ****
  Kyushu/M
 - l/3
  label/AGaSD
--- 22603,22604 ----
+--- 22613,22614 ----
 ***************
 *** 22885,22887 ****
  lass/SM
 - last-ditch
  lasted/e
--- 22881,22882 ----
+--- 22891,22892 ----
 ***************
 *** 22890,22892 ****
  last/kJYDSG
 - last-minute
  lasts/e
--- 22885,22886 ----
+--- 22895,22896 ----
 ***************
 *** 26417,26418 ****
--- 26411,26413 ----
+--- 26421,26423 ----
  Moolawatana
 + Moolenaar/M
  Moomba
@@ -2545,7 +2574,7 @@
  nationhood/M
 ! nation/M
  nationwide
--- 27183,27187 ----
+--- 27193,27197 ----
  nationals/4
 ! national/sQq3SZ
  nationhood/M
@@ -2553,7 +2582,7 @@
  nationwide
 ***************
 *** 27194,27195 ****
--- 27189,27192 ----
+--- 27199,27202 ----
  nativity/MS
 + natively
 + nativeness
@@ -2563,28 +2592,28 @@
  nuzzle/SDG
 - n/xvuNVn
  Nyah
--- 28362,28363 ----
+--- 28372,28373 ----
 ***************
 *** 29464,29466 ****
  oz
 - o/z
  Ozark/MS
--- 29460,29461 ----
+--- 29470,29471 ----
 ***************
 *** 31035,31037 ****
  Pk
 - p/KF
  pl.
--- 31030,31031 ----
+--- 31040,31041 ----
 ***************
 *** 31288,31289 ****
--- 31282,31284 ----
+--- 31292,31294 ----
  pneumonia/MS
 + pneumonic
  PO
 ***************
 *** 31460,31461 ****
--- 31455,31457 ----
+--- 31465,31467 ----
  pompom/MS
 + pompon/M
  pomposity/MS
@@ -2593,25 +2622,25 @@
  pyx/S
 - q
  Qatar
--- 32861,32862 ----
+--- 32871,32872 ----
 ***************
 *** 33378,33380 ****
  razzmatazz
 - r/d
  Rd/M
--- 33373,33374 ----
+--- 33383,33384 ----
 ***************
 *** 34979,34981 ****
  RSPCA
 - rte
  rub-a-dub
--- 34973,34974 ----
+--- 34983,34984 ----
 ***************
 *** 36012,36014 ****
  sec.
 ! s/eca
  secant/MS
--- 36005,36007 ----
+--- 36015,36017 ----
  sec.
 ! outs
  secant/MS
@@ -2620,7 +2649,7 @@
  Szechwan/M
 ! t/7k
  Ta
--- 40235,40237 ----
+--- 40245,40247 ----
  Szechwan/M
 ! tingly
  Ta
@@ -2629,10 +2658,10 @@
  Tyson/M
 - u
  ubiquitousness
--- 42609,42610 ----
+--- 42619,42620 ----
 ***************
 *** 42990,42991 ****
--- 42982,42984 ----
+--- 42992,42994 ----
  unscrupulous
 + searchable
  unsearchable
@@ -2641,13 +2670,13 @@
  Uzi/M
 - v
  vacancy/MS
--- 43245,43246 ----
+--- 43255,43256 ----
 ***************
 *** 43749,43751 ****
  Vilnius/M
 ! vim/M
  vinaigrette/MS
--- 43741,43744 ----
+--- 43751,43754 ----
  Vilnius/M
 ! Vim/M
 ! vim/?
@@ -2657,16 +2686,16 @@
  yippee
 - y/K
  YMCA
--- 45487,45488 ----
+--- 45497,45498 ----
 ***************
 *** 45586,45588 ****
  zap/SGRD
 - z/d
  Zealanders
--- 45578,45579 ----
+--- 45588,45589 ----
 ***************
 *** 45655 ****
--- 45646,45660 ----
+--- 45656,45670 ----
  zymurgy/S
 + nd
 + PayPal
@@ -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] 
-  
--- 177,179 ----
-  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
  
+*** 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/%
@@ -1,5 +1,5 @@
 *** en_NZ.orig.aff	2010-05-15 13:03:47.000000000 +0200
--- en_NZ.aff	2015-12-30 19:08:13.884560313 +0100
+--- en_NZ.aff	2016-01-09 13:16:01.734376292 +0100
 ***************
 *** 7,9 ****
  SET ISO8859-1
@@ -148,7 +148,8 @@
 ! 
  REP 66
 ***************
-*** 76,95 ****
+*** 75,95 ****
+  REP ura aru
  PFX A Y 2
 ! PFX A 0 re [^e] 
 ! PFX A 0 re- e 
@@ -169,7 +170,25 @@
  PFX E Y 1
 ! PFX E 0 dis . 
  PFX F Y 5
--- 214,233 ----
+--- 213,250 ----
+  REP ura aru
+ 
+ # 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 ,
+ ## 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 (*:)
+ #COMPOUNDRULE (*{}
+ #NOCOMPOUNDSUGS
+ 
+ # WORDCHARS 0123456789
+ 
  PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -587,7 +606,7 @@
  SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
  SFX T 0 est [aeiou]y
--- 237,631 ----
+--- 254,648 ----
  PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
  PFX K Y 1
@@ -1672,7 +1691,7 @@
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
 \ No newline at end of file
--- 638,1323 ----
+--- 655,1340 ----
  SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2360,29 +2379,44 @@
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
 *** en_NZ.orig.dic	2010-05-15 13:03:48.000000000 +0200
--- en_NZ.dic	2015-12-30 19:08:04.928657238 +0100
+--- en_NZ.dic	2016-01-08 23:04:05.825939282 +0100
+***************
+*** 1,2 ****
+--- 1,12 ----
+  47141
+ 0th
+ 1st
+ 2nd
+ 3rd
+ 4th
+ 5th
+ 6th
+ 7th
+ 8th
+ 9th
+  3GPP
 ***************
 *** 4,6 ****
  2ZB
 - A
  a/o
--- 4,5 ----
+--- 14,15 ----
 ***************
 *** 927,929 ****
  Al-Zawahiri
 - al/FAC
  Al/M
--- 926,927 ----
+--- 936,937 ----
 ***************
 *** 2941,2944 ****
  B.Sc.
 - bless
 - bible
  baa/GSD
--- 2939,2940 ----
+--- 2949,2950 ----
 ***************
 *** 4974,4975 ****
--- 4970,4972 ----
+--- 4980,4982 ----
  Brampton/M
 + Bram/M
  bran/SDGM
@@ -2391,7 +2425,7 @@
  C.Lit.
 ! cation/SM
  Ca/y
--- 5704,5706 ----
+--- 5714,5716 ----
  C.Lit.
 ! cation/MWS
  Ca/y
@@ -2400,10 +2434,10 @@
  Cathy
 - cation/MW
  catkin/SM
--- 6447,6448 ----
+--- 6457,6458 ----
 ***************
 *** 8589,8590 ****
--- 8585,8587 ----
+--- 8595,8597 ----
  coniferous
 + conj.
  conjectural
@@ -2412,16 +2446,16 @@
  red's
 - dally
  dab/TSGD
--- 10150,10151 ----
+--- 10160,10161 ----
 ***************
 *** 10360,10361 ****
--- 10356,10358 ----
+--- 10366,10368 ----
  dBm
 + dBd
  DBMS
 ***************
 *** 12535,12536 ****
--- 12532,12534 ----
+--- 12542,12544 ----
  Dutchwomen/M
 + Farsi
  duteous/Y
@@ -2430,13 +2464,13 @@
  duvet/SM
 - duxes
  DVD/MS
--- 12540,12541 ----
+--- 12550,12551 ----
 ***************
 *** 13901,13903 ****
  estuary/MS
 ! et
  ETA
--- 13898,13901 ----
+--- 13908,13911 ----
  estuary/MS
 ! et cetera
 ! et al.
@@ -2447,13 +2481,13 @@
 - fable
 - fist/MS
  fa/M
--- 14529,14530 ----
+--- 14539,14540 ----
 ***************
 *** 15323,15325 ****
  fissure/DSMG
 ! fist/6GD
  fistfight/MS
--- 15319,15321 ----
+--- 15329,15331 ----
  fissure/DSMG
 ! fist/6GDMS
  fistfight/MS
@@ -2462,44 +2496,44 @@
  g's
 - gable
  gist/MS
--- 16602,16603 ----
+--- 16612,16613 ----
 ***************
 *** 16797,16799 ****
  Garvey
 - Gary/M
  gas-permeable
--- 16792,16793 ----
+--- 16802,16803 ----
 ***************
 *** 18177,18179 ****
  gyroscope/SWM
 - dish
  ha
--- 18171,18172 ----
+--- 18181,18182 ----
 ***************
 *** 22321,22323 ****
  K-factor
 - disk/MS
  kabob's
--- 22314,22315 ----
+--- 22324,22325 ----
 ***************
 *** 23129,23132 ****
  lassoer/M
 - last-ditch
 - last-minute
  last/YSDGkJ
--- 23121,23122 ----
+--- 23131,23132 ----
 ***************
 *** 26396,26398 ****
  Missy
 ! mist/CDRGS
  mistakable/U
--- 26386,26388 ----
+--- 26396,26398 ----
  Missy
 ! mist/CDRGSM
  mistakable/U
 ***************
 *** 26745,26746 ****
--- 26735,26737 ----
+--- 26745,26747 ----
  Moog
 + Moolenaar/M
  moon/MGpDS
@@ -2508,7 +2542,7 @@
  mozzarella/SM
 - MP3
  mpg
--- 27009,27010 ----
+--- 27019,27020 ----
 ***************
 *** 27365,27372 ****
  N'Djamena
@@ -2519,7 +2553,7 @@
 - national
 - nationally
  Na/M
--- 27355,27359 ----
+--- 27365,27369 ----
  N'Djamena
 ! native/SP
  natively
@@ -2530,7 +2564,7 @@
  Nathaniel/M
 ! nation/M
  national/sQ3Sq
--- 27494,27496 ----
+--- 27504,27506 ----
  Nathaniel/M
 ! nation/MS
  national/sQ3Sq
@@ -2539,7 +2573,7 @@
  nationwide
 - native/SP
  nativity/SM
--- 27508,27509 ----
+--- 27518,27519 ----
 ***************
 *** 29852,29857 ****
  P.O.
@@ -2548,16 +2582,16 @@
 - imply
 - comply
  pa/oM
--- 29838,29839 ----
+--- 29848,29849 ----
 ***************
 *** 31702,31703 ****
--- 31684,31686 ----
+--- 31694,31696 ----
  pneumonia/MS
 + pneumonic
  PO
 ***************
 *** 31885,31886 ****
--- 31868,31870 ----
+--- 31878,31880 ----
  pompom/SM
 + pompon/M
  pomposity/SM
@@ -2566,30 +2600,30 @@
  qwertys
 - r/d
  Ra
--- 33545,33546 ----
+--- 33555,33556 ----
 ***************
 *** 35456,35458 ****
  rt
 - rte
  Ru/M
--- 35439,35440 ----
+--- 35449,35450 ----
 ***************
 *** 35619,35622 ****
  singly
 - sable
 - sally/DSG
  SA
--- 35601,35602 ----
+--- 35611,35612 ----
 ***************
 *** 40763,40766 ****
  T's
 - mist/MS
 - overt
  Ta
--- 40743,40744 ----
+--- 40753,40754 ----
 ***************
 *** 43574,43575 ****
--- 43552,43554 ----
+--- 43562,43564 ----
  unsearchable
 + searchable
  unseeing/Y
@@ -2598,7 +2632,7 @@
  Vilnius/M
 ! vim/M
  vinaigrette/MS
--- 44313,44316 ----
+--- 44323,44326 ----
  Vilnius/M
 ! Vim/M
 ! vim/?
@@ -2608,79 +2642,79 @@
  y'all
 - prey/M
  yacht/M5SmGD
--- 45886,45887 ----
+--- 45896,45897 ----
 ***************
 *** 46152,46154 ****
  zymurgy/S
 - à
  font/SM
--- 46131,46132 ----
+--- 46141,46142 ----
 ***************
 *** 46198,46200 ****
  rata/M
 - kaka/M
  waka/M
--- 46176,46177 ----
+--- 46186,46187 ----
 ***************
 *** 46216,46218 ****
  jandal/MS
 - Swanndri/M
  hoon/MS
--- 46193,46194 ----
+--- 46203,46204 ----
 ***************
 *** 46242,46244 ****
  Invercargill/M
 - Te
  Alexandra/M
--- 46218,46219 ----
+--- 46228,46229 ----
 ***************
 *** 46261,46263 ****
  Kawerau/M
 - Kerikeri/M
  Lyttelton/M
--- 46236,46237 ----
+--- 46246,46247 ----
 ***************
 *** 46491,46493 ****
  Waianakarua
 - Hakatere
  Swin
--- 46465,46466 ----
+--- 46475,46476 ----
 ***************
 *** 46690,46692 ****
  Omarama/M
 - Wairarapa/M
  Kilda/M
--- 46663,46664 ----
+--- 46673,46674 ----
 ***************
 *** 46711,46713 ****
  Wellsford/M
 - Akaroa/M
  Avonhead/M
--- 46683,46684 ----
+--- 46693,46694 ----
 ***************
 *** 46838,46840 ****
  Ballantyne's
 - DB
  Monteith's
--- 46809,46810 ----
+--- 46819,46820 ----
 ***************
 *** 46920,46922 ****
  Egmont/M
 - Waitaki/M
  katipo/M
--- 46890,46891 ----
+--- 46900,46901 ----
 ***************
 *** 46956,46958 ****
  Sunnyside/M
 - Wairau/M
  Waikoropupu
--- 46925,46926 ----
+--- 46935,46936 ----
 ***************
 *** 47141,47142 ****
  Burkina
 ! Faso/M
 \ No newline at end of file
--- 47109,47124 ----
+--- 47119,47134 ----
  Burkina
 ! Faso/M
 ! nd
@@ -1,610 +1,243 @@
-*** en_US.orig.aff	2010-05-15 13:03:47.000000000 +0200
--- en_US.aff	2015-12-30 18:35:12.218009361 +0100
+*** en_US.orig.aff	2015-12-30 18:55:30.352821552 +0100
+--- en_US.aff	2016-01-09 13:16:31.514054846 +0100
 ***************
-*** 3,4 ****
--- 3,141 ----
+*** 1,18 ****
+  SET UTF8
+  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]
+--- 1,164 ----
+ # Affix file for US English MySpell dictionary
+  SET UTF8
+  TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ'
+! 
+! 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
+! 
+! # ICONV 1
+! # ICONV ’ '
+! 
+  NOSUGGEST !
  
-***************
-*** 40,42 ****
-  SFX H   y     ieth       y
-! SFX H   0     th         [^y] 
-  
--- 177,179 ----
-  SFX H   y     ieth       y
-! SFX H   0     th         [^y]
+! # This is disabled, because if Vim does not support NOCOMPOUNDSUGS giving
+! # suggestions is extremely slow.
+! # This is disabled, because without NOCOMPOUNDSUGS support 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
  
+*** en_US.orig.dic	2015-12-30 18:55:58.928512408 +0100
+--- en_US.dic	2016-01-08 23:04:15.241835664 +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]
-  
+*** 1,25 ****
+  48756
+! 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 ----
+  48756
+! 0th
+! 1st
+! 2nd
+! 3rd
+! 4th
+! 5th
+! 6th
+! 7th
+! 8th
+! 9th
+  A/SM
 ***************
-*** 88,91 ****
-  
-! SFX M Y 1
-  SFX M   0     's         .
-  
--- 225,229 ----
-  
-! SFX M Y 2
-  SFX M   0     's         .
-+ SFX M   0     ¿s         .
-  
-***************
-*** 99,101 ****
-  
-! REP 88
-  REP a ei
--- 237,239 ----
-  
-! REP 91
-  REP a ei
-***************
-*** 137,138 ****
--- 275,278 ----
-  REP uy i
-+ REP y ie
-+ REP ie y
-  REP i ee
-***************
-*** 174,175 ****
--- 314,316 ----
-  REP ew ue
-+ REP uf ough
-  REP uff ough
-***************
-*** 188 ****
--- 329,333 ----
-  REP shun cion
-+ REP an_a a
-+ REP an_a an
-+ REP a_an a
-+ REP a_an an
-*** en_US.orig.dic	2010-05-15 13:03:48.000000000 +0200
--- en_US.dic	2010-05-15 13:03:47.000000000 +0200
-***************
-*** 1,2 ****
-! 62076
-  a
--- 1,2 ----
-! 62078
-  a
-***************
-*** 5944,5946 ****
-  bk
-! b/KGD
-  Bk/M
--- 5944,5947 ----
-  bk
-! probing
-! probed
-  Bk/M
-***************
-*** 9007,9009 ****
-  Cazzie/M
- c/B
-  CB
--- 9008,9009 ----
-***************
-*** 9233,9235 ****
-  cetacean/S
- cetera/S
-  Cetus/M
--- 9233,9234 ----
-***************
-*** 11575,11576 ****
--- 11574,11577 ----
-  conduit/MS
-+ coned
-+ cone/MS
-  coneflower/M
-***************
-*** 11712,11713 ****
--- 11713,11715 ----
-  coniferous
-+ conj.
-  conjectural/Y
-***************
-*** 14038,14043 ****
-  dazzling/Y
- db
- DB
-  dbl
-  dB/M
-  DBMS
--- 14040,14046 ----
-  dazzling/Y
-  dbl
-  dB/M
-+ dBi
-+ dBm
-+ dBd
-  DBMS
-***************
-*** 15464,15466 ****
-  dingbat/MS
-! ding/GD
-  dinghy/SM
--- 15467,15469 ----
-  dingbat/MS
-! ding/GDS
-  dinghy/SM
-***************
-*** 15690,15692 ****
-  dishevelment/MS
-! dish/GD
-  dishonest
--- 15693,15695 ----
-  dishevelment/MS
-! dish/GDMS
-  dishonest
-***************
-*** 15973,15975 ****
-  djellaba/S
- d/JGVX
-  Djibouti/M
--- 15976,15977 ----
-***************
-*** 16911,16912 ****
--- 16913,16915 ----
-  dusty/RPT
-+ Farsi
-  Dutch/M
-***************
-*** 17357,17359 ****
-  EFL
- e/FMDS
-  Efrain/M
--- 17360,17361 ----
-***************
-*** 18780,18782 ****
-  estuary/SM
-! et
-  ET
--- 18782,18785 ----
-  estuary/SM
-! et cetera/S
-! et al.
-  ET
-***************
-*** 18785,18787 ****
-  eta/SM
-! etc
-  etcetera/SM
--- 18788,18790 ----
-  eta/SM
-! etc.
-  etcetera/SM
-***************
-*** 20559,20561 ****
-  Fiori/M
- f/IRAC
-  firearm/SM
--- 20562,20563 ----
-***************
-*** 24402,24404 ****
-  guzzler/M
-! g/VBX
-  Gwalior/M
--- 24404,24406 ----
-  guzzler/M
-! gens
-  Gwalior/M
-***************
-*** 25473,25475 ****
-  hemp/MNS
- h/EMS
-  hemstitch/DSMG
--- 25475,25476 ----
-***************
-*** 25963,25965 ****
-  hobbing
-! hobbit
-  hobbler/M
--- 25964,25966 ----
-  hobbing
-! hobbit/MS
-  hobbler/M
-***************
-*** 26524,26526 ****
-  HST
- ht
-  HTML
--- 26525,26526 ----
-***************
-*** 26942,26944 ****
-  Hz
- i
-  I
--- 26942,26943 ----
-***************
-*** 29627,29629 ****
-  Jezebel/MS
- j/F
-  JFK/M
--- 29626,29627 ----
-***************
-*** 30578,30580 ****
-  keyword/SM
-! k/FGEIS
-  kg
--- 30576,30583 ----
-  keyword/SM
-! inking
-! disking
-! conking
-! inks
-! disks
-! conks
-  kg
-***************
-*** 32694,32696 ****
-  Lizzy/M
-! l/JGVXT
-  Ljubljana/M
--- 32697,32699 ----
-  Lizzy/M
-! lings
-  Ljubljana/M
-***************
-*** 34456,34458 ****
-  mash/JGZMSRD
-! m/ASK
-  masked/U
--- 34459,34462 ----
-  mash/JGZMSRD
-! rems
-! prom/S
-  masked/U
-***************
-*** 34746,34747 ****
--- 34750,34753 ----
-  Mb
-+ Mbyte
-+ Mbit
-  MB
-***************
-*** 36605,36606 ****
--- 36611,36613 ----
-  Moog
-+ Moolenaar/M
-  moo/GSD
-***************
-*** 38871,38873 ****
-  NSF
- n/T
-  NT
--- 38878,38879 ----
-***************
-*** 39011,39013 ****
-  NZ
- o
-  O
--- 39017,39018 ----
-***************
-*** 39532,39534 ****
-  om/XN
- ON
-  onanism/M
--- 39537,39538 ----
-***************
-*** 42508,42510 ****
-  pinfeather/SM
-! ping/GDRM
-  pinheaded/P
--- 42512,42514 ----
-  pinfeather/SM
-! ping/GDRMS
-  pinheaded/P
-***************
-*** 42983,42984 ****
--- 42987,42989 ----
-  pneumonia/MS
-+ pneumonic
-  PO
-***************
-*** 43216,43218 ****
-  pompom/SM
-! pompon's
-  pomposity/MS
--- 43221,43223 ----
-  pompom/SM
-! pompon/M
-  pomposity/MS
-***************
-*** 44940,44942 ****
-  PX
- p/XTGJ
-  Pygmalion/M
--- 44945,44946 ----
-***************
-*** 44983,44985 ****
-  pyx/MDSG
- q
-  Q
--- 44987,44988 ----
-***************
-*** 46507,46509 ****
-  Renault/MS
- rend
-  renderer/M
--- 46510,46511 ----
-***************
-*** 47258,47260 ****
-  ringer/M
-! ring/GZJDRM
-  ringing/Y
--- 47260,47262 ----
-  ringer/M
-! ring/GZJDRMS
-  ringing/Y
-***************
-*** 47857,47862 ****
-  rt
- rte
-  Rte
-  RTFM
- r/TGVJ
-  Rubaiyat/M
--- 47859,47862 ----
-***************
-*** 48085,48087 ****
-  Ryun/M
- S
-  SA
--- 48085,48086 ----
-***************
-*** 54450,54452 ****
-  swung
-! s/XJBG
-  sybarite/MS
--- 54449,54451 ----
-  swung
-! sings
-  sybarite/MS
-***************
-*** 56906,56908 ****
-  transit/SGVMD
-! transl
-  translatability/M
--- 56905,56907 ----
-  transit/SGVMD
-! transl.
-  translatability/M
-***************
-*** 57728,57730 ****
-  TX
-! t/XTJBG
-  Tybalt/M
--- 57727,57729 ----
-  TX
-! tings
-  Tybalt/M
-***************
-*** 57809,57811 ****
-  Tzeltal/M
- u
-  U
--- 57808,57809 ----
-***************
-*** 58494,58495 ****
--- 58492,58494 ----
-  unsearchable
-+ searchable
-  unseasonal
-***************
-*** 59072,59074 ****
-  vast/PTSYR
-! v/ASV
-  VAT
--- 59071,59073 ----
-  vast/PTSYR
-! revs
-  VAT
-***************
-*** 59538,59540 ****
-  vi/MDR
-! vim/MS
-  vinaigrette/MS
--- 59537,59540 ----
-  vi/MDR
-! Vim/MS
-! vim/?
-  vinaigrette/MS
-***************
-*** 61534,61536 ****
-  WWW
-! w/XTJGV
-  WY
--- 61534,61537 ----
-  WWW
-! wens
-! wings
-  WY
-***************
-*** 61750,61752 ****
-  yew/SM
- y/F
-  Yggdrasil/M
--- 61751,61752 ----
-***************
-*** 62058,62060 ****
-  Zsigmondy/M
-! z/TGJ
-  Zubenelgenubi/M
--- 62058,62060 ----
-  Zsigmondy/M
-! zings
-  Zubenelgenubi/M
-***************
-*** 62077 ****
--- 62077,62092 ----
-  zymurgy/S
-+ nd
-+ the the/!
-+ and and/!
-+ a a/!
-+ an an/!
-+ a an/!
-+ an a/!
-+ the a/!
-+ the an/!
-+ a the/!
-+ an the/!
-+ PayPal
-+ Google
-+ e.g.
-+ TCP\/IP
+*** 48757 ****
+--- 48744,48754 ----
+  zymurgy/M
+ a a/%
+ a an/%
+ a the/%
+ an a/%
+ an an/%
+ an the/%
+ and and/%
+ the a/%
+ the an/%
+ the the/%
@@ -453,14 +453,14 @@ endif
 ifdef PYTHON
 CFLAGS += -DFEAT_PYTHON 
 ifeq (yes, $(DYNAMIC_PYTHON))
-CFLAGS += -DDYNAMIC_PYTHON
+CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\"
 endif
 endif

 ifdef PYTHON3 
 CFLAGS += -DFEAT_PYTHON3 
 ifeq (yes, $(DYNAMIC_PYTHON3))
-CFLAGS += -DDYNAMIC_PYTHON3 
+CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\"
 endif
 endif

@@ -789,10 +789,10 @@ INCL = vim.h feature.h os_win32.h os_dos.h ascii.h keymap.h term.h macros.h \
 	gui.h

 $(OUTDIR)/if_python.o : if_python.c if_py_both.h $(INCL)
-	$(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" $< -o $@
+	$(CC) -c $(CFLAGS) $(PYTHONINC) $(PYTHON_HOME_DEF) $< -o $@

 $(OUTDIR)/if_python3.o : if_python3.c if_py_both.h $(INCL)
-	$(CC) -c $(CFLAGS) $(PYTHON3INC) -DDYNAMIC_PYTHON3_DLL=\"PYTHON$(PYTHON3_VER).dll\" $< -o $@
+	$(CC) -c $(CFLAGS) $(PYTHON3INC) $< -o $@

 $(OUTDIR)/%.o : %.c $(INCL)
 	$(CC) -c $(CFLAGS) $< -o $@
@@ -445,7 +445,9 @@ CClink = $(CC)

 # TCL
 # Uncomment this when you want to include the Tcl interface.
+# First one is for static linking, second one for dynamic loading.
 #CONF_OPT_TCL = --enable-tclinterp
+#CONF_OPT_TCL = --enable-tclinterp=dynamic
 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4

 # CSCOPE
@@ -1392,7 +1394,7 @@ SHELL = /bin/sh
 .SUFFIXES: .c .o .pro

 PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
-POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(EXTRA_DEFS)
+POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(EXTRA_DEFS)

 ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(SANITIZER_CFLAGS) $(LEAK_CFLAGS) $(POST_DEFS)

@@ -1400,7 +1402,7 @@ ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(SANITIZER_CFLAGS) $(LEAK_
 # with "-E".
 OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS)

-LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
+LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(TCL_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca

 LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="

@@ -1961,7 +1963,6 @@ test1 \
 	test_erasebackword \
 	test_eval \
 	test_fixeol \
-	test_increment \
 	test_insertcount \
 	test_listchars \
 	test_listlbr \
@@ -1997,6 +1998,8 @@ test1 \
 test_assert \
 	test_backspace_opt \
 	test_cdo \
+	test_increment \
+	test_lispwords \
 	test_menu \
 	test_quickfix \
 	test_searchpos \
@@ -2782,7 +2785,7 @@ objects/if_sniff.o: if_sniff.c
 	$(CCC) -o $@ if_sniff.c

 objects/if_tcl.o: if_tcl.c
-	$(CCC) -o $@ if_tcl.c
+	$(CCC) $(TCL_CFLAGS) -o $@ if_tcl.c

 objects/integration.o: integration.c
 	$(CCC) -o $@ integration.c
@@ -2827,7 +2830,7 @@ objects/ops.o: ops.c
 	$(CCC) -o $@ ops.c

 objects/option.o: option.c
-	$(CCC) -o $@ option.c
+	$(CCC) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) $(TCL_CFLAGS) -o $@ option.c

 objects/os_beos.o: os_beos.c
 	$(CCC) -o $@ os_beos.c
@@ -0,0 +1,20 @@
+/* vi:set ts=8 sts=4 sw=4:
+ *
+ * VIM - Vi IMproved	by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ */
+
+/*
+ * alloc.h: enumeration of alloc IDs.
+ * Each entry must be on exactly one line, GetAllocId() depends on that.
+ */
+typedef enum {
+	aid_none = 0,
+	aid_qf_dirname_start,
+	aid_qf_dirname_now,
+	aid_qf_namebuf,
+	aid_qf_errmsg,
+	aid_qf_pattern,
+} alloc_id_T;
@@ -1474,7 +1474,7 @@ Optional Features:
  --enable-perlinterp=OPTS     Include Perl interpreter.  default=no OPTS=no/yes/dynamic
  --enable-pythoninterp=OPTS   Include Python interpreter. default=no OPTS=no/yes/dynamic
  --enable-python3interp=OPTS   Include Python3 interpreter. default=no OPTS=no/yes/dynamic
-  --enable-tclinterp      Include Tcl interpreter.
+  --enable-tclinterp=OPTS      Include Tcl interpreter. default=no OPTS=no/yes/dynamic
  --enable-rubyinterp=OPTS     Include Ruby interpreter.  default=no OPTS=no/yes/dynamic
  --enable-cscope         Include cscope interface.
  --enable-workshop       Include Sun Visual Workshop support.
@@ -6695,7 +6695,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tclinterp" >&5
 $as_echo "$enable_tclinterp" >&6; }

-if test "$enable_tclinterp" = "yes"; then
+if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then

    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-tclsh argument" >&5
 $as_echo_n "checking --with-tclsh argument... " >&6; }
@@ -6931,6 +6931,7 @@ $as_echo_n "checking Tcl version... " >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5
 $as_echo "$tclver - OK" >&6; };
      tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -`
+      tcldll=`echo 'puts libtcl[info tclversion][info sharedlibextension]' | $vi_cv_path_tcl -`

      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
 $as_echo_n "checking for location of Tcl include... " >&6; }
@@ -6967,7 +6968,11 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
 $as_echo "$try/tclConfig.sh" >&6; }
 	    . "$try/tclConfig.sh"
-	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
+	    	    if test "$enable_tclinterp" = "dynamic"; then
+	      TCL_LIBS=`eval echo "$TCL_STUB_LIB_SPEC $TCL_LIBS"`
+	    else
+	      TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
+	    fi
 	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
 	    break
 	  fi
@@ -7016,6 +7021,13 @@ $as_echo "<not found>" >&6; }
 $as_echo "too old; need Tcl version 8.0 or later" >&6; }
    fi
  fi
+  if test "$enable_tclinterp" = "dynamic"; then
+    if test "X$TCL_SRC" != "X" -a "X$tcldll" != "X"; then
+      $as_echo "#define DYNAMIC_TCL 1" >>confdefs.h
+
+      TCL_CFLAGS="-DDYNAMIC_TCL_DLL=\\\"$tcldll\\\" -DDYNAMIC_TCL_VER=\\\"$tclver\\\" $TCL_CFLAGS"
+    fi
+  fi
  if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
    as_fn_error $? "could not configure Tcl" "$LINENO" 5
  fi
@@ -360,6 +360,9 @@
 /* Define if you want to include the Tcl interpreter. */
 #undef FEAT_TCL

+/* Define for linking via dlopen() or LoadLibrary() */
+#undef DYNAMIC_TCL
+
 /* Define if you want to include the Sniff interface. */
 #undef FEAT_SNIFF

@@ -1669,11 +1669,11 @@ fi

 AC_MSG_CHECKING(--enable-tclinterp argument)
 AC_ARG_ENABLE(tclinterp,
-	[  --enable-tclinterp      Include Tcl interpreter.], ,
+	[  --enable-tclinterp[=OPTS]      Include Tcl interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
 	[enable_tclinterp="no"])
 AC_MSG_RESULT($enable_tclinterp)

-if test "$enable_tclinterp" = "yes"; then
+if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then

  dnl on FreeBSD tclsh is a silly script, look for tclsh8.[5420]
  AC_MSG_CHECKING(--with-tclsh argument)
@@ -1707,6 +1707,7 @@ if test "$enable_tclinterp" = "yes"; then
      tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -`
      AC_MSG_RESULT($tclver - OK);
      tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
+      tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`

      AC_MSG_CHECKING(for location of Tcl include)
      if test "x$MACOSX" != "xyes"; then
@@ -1741,7 +1742,11 @@ if test "$enable_tclinterp" = "yes"; then
 	    AC_MSG_RESULT($try/tclConfig.sh)
 	    . "$try/tclConfig.sh"
 	    dnl use eval, because tcl 8.2 includes ${TCL_DBGX}
-	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
+	    if test "$enable_tclinterp" = "dynamic"; then
+	      TCL_LIBS=`eval echo "$TCL_STUB_LIB_SPEC $TCL_LIBS"`
+	    else
+	      TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
+	    fi
 	    dnl Use $TCL_DEFS for -D_THREAD_SAFE et al.  But only use the
 	    dnl "-D_ABC" items.  Watch out for -DFOO=long\ long.
 	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[[^-]]/d' -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
@@ -1786,6 +1791,12 @@ if test "$enable_tclinterp" = "yes"; then
      AC_MSG_RESULT(too old; need Tcl version 8.0 or later)
    fi
  fi
+  if test "$enable_tclinterp" = "dynamic"; then
+    if test "X$TCL_SRC" != "X" -a "X$tcldll" != "X"; then
+      AC_DEFINE(DYNAMIC_TCL)
+      TCL_CFLAGS="-DDYNAMIC_TCL_DLL=\\\"$tcldll\\\" -DDYNAMIC_TCL_VER=\\\"$tclver\\\" $TCL_CFLAGS"
+    fi
+  fi
  if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
    AC_MSG_ERROR([could not configure Tcl])
  fi
@@ -3738,25 +3738,30 @@ do_unlet(name, forceit)
    ht = find_var_ht(name, &varname);
    if (ht != NULL && *varname != NUL)
    {
+	if (ht == &globvarht)
+	    d = &globvardict;
+	else if (current_funccal != NULL
+			     && ht == &current_funccal->l_vars.dv_hashtab)
+	    d = &current_funccal->l_vars;
+	else if (ht == &compat_hashtab)
+	    d = &vimvardict;
+	else
+	{
+	    di = find_var_in_ht(ht, *name, (char_u *)"", FALSE);
+	    d = di == NULL ? NULL : di->di_tv.vval.v_dict;
+	}
+	if (d == NULL)
+	{
+	    EMSG2(_(e_intern2), "do_unlet()");
+	    return FAIL;
+	}
 	hi = hash_find(ht, varname);
 	if (!HASHITEM_EMPTY(hi))
 	{
 	    di = HI2DI(hi);
 	    if (var_check_fixed(di->di_flags, name, FALSE)
-		    || var_check_ro(di->di_flags, name, FALSE))
-		return FAIL;
-
-	    if (ht == &globvarht)
-		d = &globvardict;
-	    else if (current_funccal != NULL
-				 && ht == &current_funccal->l_vars.dv_hashtab)
-		d = &current_funccal->l_vars;
-	    else
-	    {
-		di = find_var_in_ht(ht, *name, (char_u *)"", FALSE);
-		d = di->di_tv.vval.v_dict;
-	    }
-	    if (d == NULL || tv_check_lock(d->dv_lock, name, FALSE))
+		    || var_check_ro(di->di_flags, name, FALSE)
+		    || tv_check_lock(d->dv_lock, name, FALSE))
 		return FAIL;

 	    delete_var(ht, hi);
@@ -1625,7 +1625,7 @@ EXTERN char *ignoredp;

 #ifdef FEAT_EVAL
 /* set by alloc_fail(): ID */
-EXTERN int  alloc_fail_id INIT(= 0);
+EXTERN alloc_id_T  alloc_fail_id INIT(= aid_none);
 /* set by alloc_fail(), when zero alloc() returns NULL */
 EXTERN int  alloc_fail_countdown INIT(= -1);
 /* set by alloc_fail(), number of times alloc() returns NULL */
@@ -402,12 +402,7 @@ lua_link_init(char *libname, int verbose)
    int
 lua_enabled(int verbose)
 {
-#ifdef WIN3264
-    char *dll = DYNAMIC_LUA_DLL;
-#else
-    char *dll = *p_luadll ? (char *)p_luadll : DYNAMIC_LUA_DLL;
-#endif
-    return lua_link_init(dll, verbose) == OK;
+    return lua_link_init((char *)p_luadll, verbose) == OK;
 }

 #endif /* DYNAMIC_LUA */
@@ -611,12 +611,7 @@ perl_runtime_link_init(char *libname, int verbose)
 perl_enabled(verbose)
    int		verbose;
 {
-#ifdef WIN3264
-    char *dll = DYNAMIC_PERL_DLL;
-#else
-    char *dll = *p_perldll ? (char *)p_perldll : DYNAMIC_PERL_DLL;
-#endif
-    return perl_runtime_link_init(dll, verbose) == OK;
+    return perl_runtime_link_init((char *)p_perldll, verbose) == OK;
 }
 #endif /* DYNAMIC_PERL */

@@ -736,12 +736,7 @@ python_runtime_link_init(char *libname, int verbose)
    int
 python_enabled(int verbose)
 {
-#ifdef WIN3264
-    char *dll = DYNAMIC_PYTHON_DLL;
-#else
-    char *dll = *p_pydll ? (char *)p_pydll : DYNAMIC_PYTHON_DLL;
-#endif
-    return python_runtime_link_init(dll, verbose) == OK;
+    return python_runtime_link_init((char *)p_pydll, verbose) == OK;
 }

 /*
@@ -686,12 +686,7 @@ py3_runtime_link_init(char *libname, int verbose)
    int
 python3_enabled(int verbose)
 {
-#ifdef WIN3264
-    char *dll = DYNAMIC_PYTHON3_DLL;
-#else
-    char *dll = *p_py3dll ? (char *)p_py3dll : DYNAMIC_PYTHON3_DLL;
-#endif
-    return py3_runtime_link_init(dll, verbose) == OK;
+    return py3_runtime_link_init((char *)p_py3dll, verbose) == OK;
 }

 /* Load the standard Python exceptions - don't import the symbols from the
@@ -685,12 +685,7 @@ ruby_runtime_link_init(char *libname, int verbose)
 ruby_enabled(verbose)
    int		verbose;
 {
-#ifdef WIN3264
-    char *dll = DYNAMIC_RUBY_DLL;
-#else
-    char *dll = *p_rubydll ? (char *)p_rubydll : DYNAMIC_RUBY_DLL;
-#endif
-    return ruby_runtime_link_init(dll, verbose) == OK;
+    return ruby_runtime_link_init((char *)p_rubydll, verbose) == OK;
 }
 #endif /* defined(DYNAMIC_RUBY) || defined(PROTO) */

@@ -160,6 +160,20 @@ static struct ref refsdeleted;	/* dummy object for deleted ref list */
 typedef int HANDLE;
 # endif

+# ifndef WIN3264
+#  include <dlfcn.h>
+#  define HANDLE void*
+#  define TCL_PROC void*
+#  define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+#  define symbol_from_dll dlsym
+#  define close_dll dlclose
+# else
+#  define TCL_PROC FARPROC
+#  define load_dll vimLoadLib
+#  define symbol_from_dll GetProcAddress
+#  define close_dll FreeLibrary
+# endif
+
 /*
 * Declare HANDLE for tcl.dll and function pointers.
 */
@@ -170,7 +184,6 @@ void (*dll_Tcl_FindExecutable)(const void *);
 /*
 * Table of name to function pointer of tcl.
 */
-#define TCL_PROC FARPROC
 static struct {
    char* name;
    TCL_PROC* ptr;
@@ -197,7 +210,7 @@ tcl_runtime_link_init(char *libname, int verbose)

    if (hTclLib)
 	return OK;
-    if (!(hTclLib = vimLoadLib(libname)))
+    if (!(hTclLib = load_dll(libname)))
    {
 	if (verbose)
 	    EMSG2(_(e_loadlib), libname);
@@ -205,10 +218,10 @@ tcl_runtime_link_init(char *libname, int verbose)
    }
    for (i = 0; tcl_funcname_table[i].ptr; ++i)
    {
-	if (!(*tcl_funcname_table[i].ptr = GetProcAddress(hTclLib,
+	if (!(*tcl_funcname_table[i].ptr = symbol_from_dll(hTclLib,
 			tcl_funcname_table[i].name)))
 	{
-	    FreeLibrary(hTclLib);
+	    close_dll(hTclLib);
 	    hTclLib = NULL;
 	    if (verbose)
 		EMSG2(_(e_loadfunc), tcl_funcname_table[i].name);
@@ -246,13 +259,13 @@ tcl_enabled(verbose)
    int		verbose;
 {
    if (!stubs_initialized && find_executable_arg != NULL
-	    && tcl_runtime_link_init(DYNAMIC_TCL_DLL, verbose) == OK)
+	    && tcl_runtime_link_init((char *)p_tcldll, verbose) == OK)
    {
 	Tcl_Interp *interp;

 	dll_Tcl_FindExecutable(find_executable_arg);

-	if (interp = dll_Tcl_CreateInterp())
+	if ((interp = dll_Tcl_CreateInterp()) != NULL)
 	{
 	    if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0))
 	    {
@@ -272,7 +285,7 @@ tcl_end()
 #ifdef DYNAMIC_TCL
    if (hTclLib)
    {
-	FreeLibrary(hTclLib);
+	close_dll(hTclLib);
 	hTclLib = NULL;
    }
 #endif
@@ -2039,6 +2052,10 @@ tcldelallrefs(ref)
    int		err;
    char	*result;

+    /* TODO: this code currently crashes Vim on exit */
+    if (exiting)
+	return;
+
    while (ref != NULL)
    {
 	next = ref->next;
@@ -837,12 +837,11 @@ alloc(size)

 /*
 * alloc() with an ID for alloc_fail().
- * LAST_ID_USED: 5
 */
    char_u *
 alloc_id(size, id)
    unsigned	size;
-    int		id;
+    alloc_id_T	id UNUSED;
 {
 #ifdef FEAT_EVAL
    if (alloc_fail_id == id && alloc_does_fail())
@@ -1001,13 +1000,12 @@ theend:

 /*
 * lalloc() with an ID for alloc_fail().
- * See LAST_ID_USED above.
 */
    char_u *
 lalloc_id(size, message, id)
    long_u	size;
    int		message;
-    int		id;
+    alloc_id_T	id UNUSED;
 {
 #ifdef FEAT_EVAL
    if (alloc_fail_id == id && alloc_does_fail())
@@ -1812,10 +1812,11 @@ static struct vimoption
    {"loadplugins", "lpl",  P_BOOL|P_VI_DEF,
 			    (char_u *)&p_lpl, PV_NONE,
 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
-#if defined(DYNAMIC_LUA) && !defined(WIN3264)
+#if defined(DYNAMIC_LUA)
    {"luadll",      NULL,   P_STRING|P_VI_DEF|P_SECURE,
 			    (char_u *)&p_luadll, PV_NONE,
-			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)DYNAMIC_LUA_DLL, (char_u *)0L}
+			    SCRIPTID_INIT},
 #endif
 #ifdef FEAT_GUI_MAC
    {"macatsui",    NULL,   P_BOOL|P_VI_DEF|P_RCLR,
@@ -2064,10 +2065,11 @@ static struct vimoption
 # endif
 #endif
 				(char_u *)0L} SCRIPTID_INIT},
-#if defined(DYNAMIC_PERL) && !defined(WIN3264)
+#if defined(DYNAMIC_PERL)
    {"perldll",     NULL,   P_STRING|P_VI_DEF|P_SECURE,
 			    (char_u *)&p_perldll, PV_NONE,
-			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)DYNAMIC_PERL_DLL, (char_u *)0L}
+			    SCRIPTID_INIT},
 #endif
    {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
 			    (char_u *)&p_pi, PV_PI,
@@ -2174,15 +2176,17 @@ static struct vimoption
 			    (char_u *)NULL, PV_NONE,
 #endif
 			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
-#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)
+#if defined(DYNAMIC_PYTHON3)
    {"pythonthreedll",  NULL,   P_STRING|P_VI_DEF|P_SECURE,
 			    (char_u *)&p_py3dll, PV_NONE,
-			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)DYNAMIC_PYTHON3_DLL, (char_u *)0L}
+			    SCRIPTID_INIT},
 #endif
-#if defined(DYNAMIC_PYTHON) && !defined(WIN3264)
+#if defined(DYNAMIC_PYTHON)
    {"pythondll",   NULL,   P_STRING|P_VI_DEF|P_SECURE,
 			    (char_u *)&p_pydll, PV_NONE,
-			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)DYNAMIC_PYTHON_DLL, (char_u *)0L}
+			    SCRIPTID_INIT},
 #endif
    {"quoteescape", "qe",   P_STRING|P_ALLOCED|P_VI_DEF,
 #ifdef FEAT_TEXTOBJ
@@ -2257,10 +2261,11 @@ static struct vimoption
 			    {(char_u *)NULL, (char_u *)0L}
 #endif
 			    SCRIPTID_INIT},
-#if defined(DYNAMIC_RUBY) && !defined(WIN3264)
+#if defined(DYNAMIC_RUBY)
    {"rubydll",     NULL,   P_STRING|P_VI_DEF|P_SECURE,
 			    (char_u *)&p_rubydll, PV_NONE,
-			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)DYNAMIC_RUBY_DLL, (char_u *)0L}
+			    SCRIPTID_INIT},
 #endif
    {"ruler",	    "ru",   P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
 #ifdef FEAT_CMDL_INFO
@@ -2652,6 +2657,12 @@ static struct vimoption
    {"tagstack",    "tgst", P_BOOL|P_VI_DEF,
 			    (char_u *)&p_tgst, PV_NONE,
 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
+#if defined(DYNAMIC_TCL)
+    {"tcldll",      NULL,   P_STRING|P_VI_DEF|P_SECURE,
+			    (char_u *)&p_tcldll, PV_NONE,
+			    {(char_u *)DYNAMIC_TCL_DLL, (char_u *)0L}
+			    SCRIPTID_INIT},
+#endif
    {"term",	    NULL,   P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
 			    (char_u *)&T_NAME, PV_NONE,
 			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
@@ -639,7 +639,7 @@ EXTERN char_u	*p_lcs;		/* 'listchars' */

 EXTERN int	p_lz;		/* 'lazyredraw' */
 EXTERN int	p_lpl;		/* 'loadplugins' */
-#if defined(DYNAMIC_LUA) && !defined(WIN3264)
+#if defined(DYNAMIC_LUA)
 EXTERN char_u	*p_luadll;	/* 'luadll' */
 #endif
 #ifdef FEAT_GUI_MAC
@@ -701,13 +701,13 @@ EXTERN char_u	*p_path;	/* 'path' */
 #ifdef FEAT_SEARCHPATH
 EXTERN char_u	*p_cdpath;	/* 'cdpath' */
 #endif
-#if defined(DYNAMIC_PERL) && !defined(WIN3264)
+#if defined(DYNAMIC_PERL)
 EXTERN char_u	*p_perldll;	/* 'perldll' */
 #endif
-#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)
+#if defined(DYNAMIC_PYTHON3)
 EXTERN char_u	*p_py3dll;	/* 'pythonthreedll' */
 #endif
-#if defined(DYNAMIC_PYTHON) && !defined(WIN3264)
+#if defined(DYNAMIC_PYTHON)
 EXTERN char_u	*p_pydll;	/* 'pythondll' */
 #endif
 #ifdef FEAT_RELTIME
@@ -729,7 +729,7 @@ EXTERN int	p_rs;		/* 'restorescreen' */
 EXTERN int	p_ari;		/* 'allowrevins' */
 EXTERN int	p_ri;		/* 'revins' */
 #endif
-#if defined(DYNAMIC_RUBY) && !defined(WIN3264)
+#if defined(DYNAMIC_RUBY)
 EXTERN char_u	*p_rubydll;	/* 'rubydll' */
 #endif
 #ifdef FEAT_CMDL_INFO
@@ -847,6 +847,9 @@ EXTERN long	p_tl;		/* 'taglength' */
 EXTERN int	p_tr;		/* 'tagrelative' */
 EXTERN char_u	*p_tags;	/* 'tags' */
 EXTERN int	p_tgst;		/* 'tagstack' */
+#if defined(DYNAMIC_TCL)
+EXTERN char_u	*p_tcldll;	/* 'tcldll' */
+#endif
 #ifdef FEAT_ARABIC
 EXTERN int	p_tbidi;	/* 'termbidi' */
 #endif
@@ -20,12 +20,12 @@ void adjust_cursor_col __ARGS((void));
 int leftcol_changed __ARGS((void));
 void vim_mem_profile_dump __ARGS((void));
 char_u *alloc __ARGS((unsigned size));
-char_u *alloc_id __ARGS((unsigned size, int id));
+char_u *alloc_id __ARGS((unsigned size, alloc_id_T id));
 char_u *alloc_clear __ARGS((unsigned size));
 char_u *alloc_check __ARGS((unsigned size));
 char_u *lalloc_clear __ARGS((long_u size, int message));
 char_u *lalloc __ARGS((long_u size, int message));
-char_u *lalloc_id __ARGS((long_u size, int message, int id));
+char_u *lalloc_id __ARGS((long_u size, int message, alloc_id_T id));
 void *mem_realloc __ARGS((void *ptr, size_t size));
 void do_outofmem_msg __ARGS((long_u size));
 void free_all_mem __ARGS((void));
@@ -59,6 +59,12 @@
 # define SPELL_PRINTTREE
 #endif

+/* Use SPELL_COMPRESS_ALLWAYS for debugging: compress the word tree after
+ * adding a word.  Only use it for small word lists! */
+#if 0
+# define SPELL_COMPRESS_ALLWAYS
+#endif
+
 /* Use DEBUG_TRIEWALK to print the changes made in suggest_trie_walk() for a
 * specific word. */
 #if 0
@@ -177,6 +183,8 @@
 * <timestamp>   8 bytes    time in seconds that must match with .sug file
 *
 * sectionID == SN_NOSPLITSUGS: nothing
+	 *
+ * sectionID == SN_NOCOMPOUNDSUGS: nothing
 *
 * sectionID == SN_WORDS: <word> ...
 * <word>	 N bytes    NUL terminated common word
@@ -501,6 +509,7 @@ struct slang_S
    garray_T	sl_repsal;	/* list of fromto_T entries from REPSAL lines */
    short	sl_repsal_first[256];  /* sl_rep_first for REPSAL lines */
    int		sl_nosplitsugs;	/* don't suggest splitting a word */
+    int		sl_nocompoundsugs; /* don't suggest compounding */

    /* Info from the .sug file.  Loaded on demand. */
    time_t	sl_sugtime;	/* timestamp for .sug file */
@@ -570,6 +579,7 @@ typedef struct langp_S
 #define SN_WORDS	13	/* common words */
 #define SN_NOSPLITSUGS	14	/* don't split word for suggestions */
 #define SN_INFO		15	/* info section */
+#define SN_NOCOMPOUNDSUGS 16	/* don't compound for suggestions */
 #define SN_END		255	/* end of sections */

 #define SNF_REQUIRED	1	/* <sectionflags>: required section */
@@ -2913,7 +2923,11 @@ spell_load_file(fname, lang, old_lp, silent)
 		break;

 	    case SN_NOSPLITSUGS:
-		lp->sl_nosplitsugs = TRUE;		/* <timestamp> */
+		lp->sl_nosplitsugs = TRUE;
+		break;
+
+	    case SN_NOCOMPOUNDSUGS:
+		lp->sl_nocompoundsugs = TRUE;
 		break;

 	    case SN_COMPOUND:
@@ -5005,6 +5019,7 @@ typedef struct spellinfo_S
    char_u	*si_sofoto;	/* SOFOTO text */
    int		si_nosugfile;	/* NOSUGFILE item found */
    int		si_nosplitsugs;	/* NOSPLITSUGS item found */
+    int		si_nocompoundsugs; /* NOCOMPOUNDSUGS item found */
    int		si_followup;	/* soundsalike: ? */
    int		si_collapse;	/* soundsalike: ? */
    hashtab_T	si_commonwords;	/* hashtable for common words */
@@ -5130,9 +5145,9 @@ spell_print_node(wordnode_T *node, int depth)
 	PRINTSOME(line1, depth, "(%d)", node->wn_nr, 0);
 	PRINTSOME(line2, depth, "    ", 0, 0);
 	PRINTSOME(line3, depth, "    ", 0, 0);
-	msg(line1);
-	msg(line2);
-	msg(line3);
+	msg((char_u *)line1);
+	msg((char_u *)line2);
+	msg((char_u *)line3);
    }
    else
    {
@@ -5158,9 +5173,9 @@ spell_print_node(wordnode_T *node, int depth)

 	if (node->wn_byte == NUL)
 	{
-	    msg(line1);
-	    msg(line2);
-	    msg(line3);
+	    msg((char_u *)line1);
+	    msg((char_u *)line2);
+	    msg((char_u *)line3);
 	}

 	/* do the children */
@@ -5598,6 +5613,10 @@ spell_read_aff(spin, fname)
 	    {
 		spin->si_nosplitsugs = TRUE;
 	    }
+	    else if (is_aff_rule(items, itemcnt, "NOCOMPOUNDSUGS", 1))
+	    {
+		spin->si_nocompoundsugs = TRUE;
+	    }
 	    else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))
 	    {
 		spin->si_nosugfile = TRUE;
@@ -7621,7 +7640,7 @@ tree_add_word(spin, word, root, flags, region, affixID)
 	node = *prev;
    }
 #ifdef SPELL_PRINTTREE
-    smsg("Added \"%s\"", word);
+    smsg((char_u *)"Added \"%s\"", word);
    spell_print_tree(root->wn_sibling);
 #endif

@@ -7647,7 +7666,7 @@ tree_add_word(spin, word, root, flags, region, affixID)
     *    (si_compress_cnt == 1) and the number of free nodes drops below the
     *    maximum word length.
     */
-#ifndef SPELL_PRINTTREE
+#ifndef SPELL_COMPRESS_ALLWAYS
    if (spin->si_compress_cnt == 1
 	    ? spin->si_free_count < MAXWLEN
 	    : spin->si_blocks_cnt >= compress_start)
@@ -8295,6 +8314,16 @@ write_vim_spell(spin, fname)
 	put_bytes(fd, (long_u)0, 4);			/* <sectionlen> */
    }

+    /* SN_NOCOMPUNDSUGS: nothing
+     * This is used to notify that no suggestions with compounds are to be
+     * made. */
+    if (spin->si_nocompoundsugs)
+    {
+	putc(SN_NOCOMPOUNDSUGS, fd);			/* <sectionID> */
+	putc(0, fd);					/* <sectionflags> */
+	put_bytes(fd, (long_u)0, 4);			/* <sectionlen> */
+    }
+
    /* SN_COMPOUND: compound info.
     * We don't mark it required, when not supported all compound words will
     * be bad words. */
@@ -11883,6 +11912,7 @@ suggest_trie_walk(su, lp, fword, soundfold)
 		 */
 		try_compound = FALSE;
 		if (!soundfold
+			&& !slang->sl_nocompoundsugs
 			&& slang->sl_compprog != NULL
 			&& ((unsigned)flags >> 24) != 0
 			&& sp->ts_twordlen - sp->ts_splitoff
@@ -11907,7 +11937,7 @@ suggest_trie_walk(su, lp, fword, soundfold)

 		/* For NOBREAK we never try splitting, it won't make any word
 		 * valid. */
-		if (slang->sl_nobreak)
+		if (slang->sl_nobreak && !slang->sl_nocompoundsugs)
 		    try_compound = TRUE;

 		/* If we could add a compound word, and it's also possible to
@@ -102,7 +102,6 @@ SCRIPTS_ALL = \
 	test_erasebackword.out \
 	test_eval.out \
 	test_fixeol.out \
-	test_increment.out \
 	test_insertcount.out \
 	test_listchars.out \
 	test_listlbr.out \
@@ -174,6 +173,7 @@ SCRIPTS_GUI = test16.out
 # Keep test_alot.res as the last one, sort the others.
 NEW_TESTS = test_assert.res \
 	    test_cdo.res \
+	    test_increment.res \
 	    test_quickfix.res \
 	    test_viml.res \
 	    test_alot.res
@@ -43,6 +43,22 @@ set nomore
 " Output all messages in English.
 lang mess C

+let s:srcdir = expand('%:p:h:h')
+
+" Support function: get the alloc ID by name.
+function GetAllocId(name)
+  exe 'split ' . s:srcdir . '/alloc.h'
+  /typedef enum/
+  let top = getline('.')
+  let lnum = search('aid_' . a:name . ',')
+  if lnum == 0
+    call add(v:errors, 'Alloc ID ' . a:name . ' not defined')
+  endif
+  close
+  return lnum - top
+endfunc
+
+
 " Source the test script.  First grab the file name, in case the script
 " navigates away.
 let testname = expand('%')
@@ -68,7 +84,8 @@ function /^Test_
 redir END
 let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))

-for test in tests
+" Execute the tests in alphabetical order.
+ for test in sort(tests)
  if exists("*SetUp")
    call SetUp()
  endif
@@ -1,734 +0,0 @@
-Tests for using Ctrl-A/Ctrl-X on visual selections
-
-Test cases
-==========
-
-1) Ctrl-A on visually selected number
-Text:
-foobar-10
-    Expected:
-    1)    Ctrl-A on start of line:
-	foobar-9
-    2)    Ctrl-A on visually selected "-10":
-	foobar-9
-    3)    Ctrl-A on visually selected "10":
-	foobar-11
-    4)    Ctrl-X on visually selected "-10"
-	foobar-11
-    5)    Ctrl-X on visually selected "10"
-	foobar-9
-
-2) Ctrl-A on visually selected lines
-Text:
-10
-20
-30
-40
-
-    Expected:
-    1) Ctrl-A on visually selected lines:
-11
-21
-31
-41
-
-    2) Ctrl-X on visually selected lines:
-9
-19
-29
-39
-
-3) g Ctrl-A on visually selected lines, with non-numbers in between
-Text:
-10
-
-20
-
-30
-
-40
-
-    Expected:
-    1) 2 g Ctrl-A on visually selected lines:
-12
-
-24
-
-36
-
-48
-    2) 2 g Ctrl-X on visually selected lines
-8
-
-16
-
-24
-
-32
-
-4) Ctrl-A on non-number
-Text:
-foobar-10
-    Expected:
-    1) visually select foobar:
-    foobar-10
-
-5) g<Ctrl-A> on letter
-Test:
-a
-a
-a
-a
-    Expected:
-    1) g Ctrl-A on visually selected lines
-    b
-    c
-    d
-    e
-
-6) g<Ctrl-A> on letter
-Test:
-z
-z
-z
-z
-    Expected:
-    1) g Ctrl-X on visually selected lines
-    y
-    x
-    w
-    v
-
-7) <Ctrl-A> on letter
-Test:
-2
-1
-0
-1
-2
-
-    Expected:
-    1) Ctrl-A on visually selected lines
-    3
-    2
-    1
-    0
-    -1
-
-    2) Ctrl-X on visually selected lines
-    1
-    0
-    -1
-    -2
-    -3
-8) Block increment on 0x9
-Text:
-0x9
-0x9
-    Expected:
-    1) Ctrl-A on visually block selected region (cursor at beginning):
-    0xa
-    0xa
-    2) Ctrl-A on visually block selected region (cursor at end)
-    0xa
-    0xa
-
-9) Increment and redo
-Text:
-2
-2
-
-3
-3
-
-    Expected:
-    1) 2 Ctrl-A on first 2 visually selected lines
-    4
-    4
-    2) redo (.) on 3
-    5
-    5
-10) sequentially decrement 1
-Text:
-1
-1
-1
-1
-    Expected:
-    1) g Ctrl-X on visually selected lines
-    0
-    -1
-    -2
-    -3
-
-11) visually block selected indented lines
-Text:
-    1
-1
-    1
-    1
-    Expexted:
-    1) g Ctrl-A on block selected indented lines
-    2
-1
-    3
-    4
-
-12) visually selected several columns
-Text:
-0 0
-0 0
-0 0
-    Expected:
-    1) 'v' select last zero and first zeroes
-    0 1
-    1 0
-    1 0
-
-13) visually selected part of columns
-Text:
-max: 100px
-max: 200px
-max: 300px
-max: 400px
-    Expected:
-    1) 'v' on first two numbers Ctrl-A
-    max: 110px
-    max: 220px
-    max: 330px
-    max: 400px
-    2) 'v' on first two numbers Ctrl-X
-    max: 90px
-    max: 190px
-    max: 290px
-    max: 400px
-
-14) redo in block mode
-Text:
-1 1
-1 1
-    Expected:
-    1) Ctrl-a on first column, redo on second column
-    2 2
-    2 2
-
-15) block select single numbers
-Text:
-101
-    Expected:
-    1) Ctrl-a on visually selected zero
-    111
-
-16) increment right aligned numbers
-Text:
-   1
-  19
- 119
-    Expected:
-    1) Ctrl-a on line selected region
-       2
-      20
-     120
-
-17) block-wise increment and redo
-Text:
-  100
-  1
-
-  100
-  1
-
-  Expected:
-  1) Ctrl-V j $ on first block, afterwards '.' on second
-  101
-  2
-
-  101
-  2
-
-18) repeat of g<Ctrl-a>
-Text:
-  0
-  0
-  0
-  0
-
-  Expected:
-  1) V 4j g<ctrl-a>, repeat twice afterwards with .
-  3
-  6
-  9
-  12
-  
-19) increment on number with nrformat including alpha
-Text:
- 1
- 1a
-
- Expected:
- 1) <Ctrl-V>j$ <ctrl-a>
- 2
- 2a
-
-20) increment a single letter
-Text:
- a
-
- Expected:
- 1) <Ctrl-a> and cursor is on a
- b
-
-21) block-wise increment on part of hexadecimal
-Text:
-0x123456
-
-  Expected:
-  1) Ctrl-V f3 <ctrl-a>
-0x124456
-
-22) Block increment on 0b0
-Text:
-0b1
-0b1
-    Expected:
-    1) Ctrl-A on visually block selected region (cursor at beginning):
-    0b10
-    0b10
-    2) Ctrl-A on visually block selected region (cursor at end)
-    0b10
-    0b10
-
-23) block-wise increment on part of binary
-Text:
-0b1001
-
-  Expected:
-  1) Ctrl-V 5l <ctrl-a>
-0b1011
-
-24) increment hexadecimal
-Text:
-0x0b1001
-
-  Expected:
-  1) <ctrl-a>
-0x0b1002
-
-25) increment binary with nrformats including alpha
-Text:
-0b1001a
-
-  Expected:
-  1) <ctrl-a>
-0b1010a
-
-26) increment binary with 64 bits
-Text:
-0b1111111111111111111111111111111111111111111111111111111111111110
-
-  Expected:
-  1) <ctrl-a>
-0b1111111111111111111111111111111111111111111111111111111111111111
-
-
-STARTTEST
-:so small.vim
-:"
-:" Avoid CTRL-X being mapped in Visual mode for MS-Windows
-:vmapclear
-:"
-:" Test 1
-:/^S1=/+,/^E1=/-y a
-:/^E1=/+put a
-:/^E1=/+2put a
-f-v$:/^E1=/+3put a
-f1v$:/^E1=/+4put a
-f-v$:/^E1=/+5put a
-f1v$
-
-:" Test 2
-:/^S2=/+,/^E2=/-y a
-:/^E2=/+put a
-V3k$3j:.+put a
-V3k$
-
-:" Test 3
-:/^S3=/+,/^E3=/-y a
-:/^E3=/+put a
-V6k2g6j:.+put a
-V6k2g
-
-:" Test 4
-:/^S4=/+,/^E4=/-y a
-:/^E4=/+put a
-vf-
-
-:" Test 5
-:set nrformats+=alpha
-:/^S5=/+,/^E5=/-y a
-:/^E5=/+put a
-v3kg
-
-:" Test 6
-:/^S6=/+,/^E6=/-y a
-:/^E6=/+put a
-v3kg
-
-:" Test 7
-:set nrformats&vim
-:/^S7=/+,/^E7=/-y a
-:/^E7=/+put a
-V4k4j:.+put a
-V4k
-
-:" Test 8
-:/^S8=/+,/^E8=/-y a
-:/^E8=/+put a
-kj$j:.+put a
-k$+
-
-:" Test 9
-:/^S9=/+,/^E9=/-y a
-:/^E9=/+put a
-5kVj23j.
-
-:" Test 10
-:/^S10=/+,/^E10=/-y a
-:/^E10=/+put a
-V3kg
-
-: Test 11
-:/^S11=/+,/^E11=/-y a
-:/^E11=/+put a
-3kf13jg
-
-:" Test 12
-:/^S12=/+,/^E12=/-y a
-:/^E12=/+put a
-2k$v++
-
-:" Test 13
-:/^S13=/+,/^E13=/-y a
-:/^E13=/+put a
-3kf1l2j3j:.+put a
-3kf1l2j
-
-:" Test 14
-:/^S14=/+,/^E14=/-y a
-:/^E14=/+put a
-kw.
-
-:" Test 15
-:/^S15=/+,/^E15=/-y a
-:/^E15=/+put a
-lv
-
-:" Test 16
-:/^S16=/+,/^E16=/-y a
-:/^E16=/+put a
-V3k
-
-:" Test 17
-:/^S17=/+,/^E17=/-y a
-:/^E17=/+put a
-4kj$2j.
-
-:" Test 18
-:/^S18=/+,/^E18=/-y a
-:/^E18=/+put a
-V3kg..
-
-:" Test 19
-:set nrformats+=alpha
-:/^S19=/+,/^E19=/-y a
-:/^E19=/+put a
-k$
-:set nrformats&vim
-
-:" Test 20
-:set nrformats+=alpha
-:/^S20=/+,/^E20=/-y a
-:/^E20=/+put a
-:.put =col('.')
-:set nrformats&vim
-
-:" Test 21
-:/^S21=/+,/^E21=/-y a
-:/^E21=/+put a
-:set nrformats&vim
-f3
-
-:" Test 22
-:/^S22=/+,/^E22=/-y a
-:/^E22=/+put a
-kj$j:.+put a
-k$+
-
-:" Test 23
-:/^S23=/+,/^E23=/-y a
-:/^E23=/+put a
-:set nrformats&vim
-4l
-
-:" Test 24
-:/^S24=/+,/^E24=/-y a
-:/^E24=/+put a
-:set nrformats&vim
-$
-
-:" Test 25
-:set nrformats+=alpha
-:/^S25=/+,/^E25=/-y a
-:/^E25=/+put a
-k$
-:set nrformats&vim
-
-:" Test 26
-:set nrformats+=alpha
-:/^S26=/+,/^E26=/-y a
-:/^E26=/+put a
-k$
-:set nrformats&vim
-
-:" Save the report
-:/^# Test 1/,$w! test.out
-:qa!
-
-
-# Test 1
-S1======
-foobar-10
-E1======
-
-
-
-# Test 2
-S2=====
-10
-20
-30
-40
-E2=====
-
-
-
-# Test 3
-S3=====
-10
-
-20
-
-30
-
-40
-E3=====
-
-
-
-# Test 4
-S4=====
-foobar-10
-E4=====
-
-
-
-# Test 5
-S5====
-a
-a
-a
-a
-E5====
-
-
-# Test 6
-S6====
-z
-z
-z
-z
-E6====
-
-
-
-# Test 7
-S7====
-2
-1
-0
-1
-2
-E7====
-
-
-
-# Test 8
-S8====
-0x9
-0x9
-E8====
-
-
-
-
-# Test 9
-S9====
-2
-2
-
-3
-3
-
-E9====
-
-
-
-
-# Test 10
-S10====
-1
-1
-1
-1
-E10====
-
-
-
-
-# Test 11
-S11====
-    1
-1
-    1
-    1
-E11====
-
-
-
-# Test 12
-S12====
-0 0
-0 0
-0 0
-E12====
-
-
-
-# Test 13
-S13====
-max: 100px
-max: 200px
-max: 300px
-max: 400px
-E13====
-
-
-
-# Test 14
-S14====
-1 1
-1 1
-E14====
-
-
-
-# Test 15
-S15====
-101
-E15====
-
-
-
-# Test 16
-S16====
-   1
-  19
- 119
-E16====
-
-
-
-# Test 17
-S17====
- 100
- 1
-
- 100
- 1
-E17====
-
-
-# Test 18
-S18====
-0
-0
-0
-0
-E18====
-
-
-
-# Test 19
-S19====
-1
-1a
-E19====
-
-
-
-# Test 20
-S20====
-a
-E20====
-
-
-
-# Test 21
-S21====
-0x123456
-E21====
-
-
-
-# Test 22
-S22====
-0b1
-0b1
-E22====
-
-
-
-
-# Test 23
-S23====
-0b1001
-E23====
-
-
-
-
-# Test 24
-S24====
-0x0b1001
-E24====
-
-
-
-
-# Test 25
-S25====
-0b1001a
-E25====
-
-
-
-
-# Test 26
-S26====
-0b11111111111111111111111111111110
-E26====
-
-
-
-ENDTEST
-
@@ -1,340 +0,0 @@
-# Test 1
-S1======
-foobar-10
-E1======
-
-foobar-9
-foobar-9
-foobar-11
-foobar-11
-foobar-9
-
-
-# Test 2
-S2=====
-10
-20
-30
-40
-E2=====
-
-11
-21
-31
-41
-
-9
-19
-29
-39
-
-# Test 3
-S3=====
-10
-
-20
-
-30
-
-40
-E3=====
-
-12
-
-24
-
-36
-
-48
-
-8
-
-16
-
-24
-
-32
-
-# Test 4
-S4=====
-foobar-10
-E4=====
-
-foobar-10
-
-
-# Test 5
-S5====
-a
-a
-a
-a
-E5====
-
-b
-c
-d
-e
-
-# Test 6
-S6====
-z
-z
-z
-z
-E6====
-
-y
-x
-w
-v
-
-
-# Test 7
-S7====
-2
-1
-0
-1
-2
-E7====
-
-3
-2
-1
-0
-1
-
-1
-0
-1
-2
-3
-
-# Test 8
-S8====
-0x9
-0x9
-E8====
-
-0xa
-0xa
-
-0xa
-0xa
-
-
-# Test 9
-S9====
-2
-2
-
-3
-3
-
-E9====
-
-4
-4
-
-5
-5
-
-
-
-
-# Test 10
-S10====
-1
-1
-1
-1
-E10====
-
-0
-1
-2
-3
-
-
-
-# Test 11
-S11====
-    1
-1
-    1
-    1
-E11====
-
-    2
-1
-    3
-    4
-
-
-# Test 12
-S12====
-0 0
-0 0
-0 0
-E12====
-
-0 1
-1 0
-1 0
-
-
-# Test 13
-S13====
-max: 100px
-max: 200px
-max: 300px
-max: 400px
-E13====
-
-max: 110px
-max: 210px
-max: 310px
-max: 400px
-
-max: 90px
-max: 190px
-max: 290px
-max: 400px
-
-# Test 14
-S14====
-1 1
-1 1
-E14====
-
-2 2
-2 2
-
-
-# Test 15
-S15====
-101
-E15====
-
-111
-
-
-# Test 16
-S16====
-   1
-  19
- 119
-E16====
-
-   2
-  20
- 120
-
-
-# Test 17
-S17====
- 100
- 1
-
- 100
- 1
-E17====
-
- 101
- 2
-
- 101
- 1
-
-# Test 18
-S18====
-0
-0
-0
-0
-E18====
-
-3
-6
-9
-12
-
-
-# Test 19
-S19====
-1
-1a
-E19====
-
-2
-2a
-
-
-# Test 20
-S20====
-a
-E20====
-
-b
-1
-
-
-# Test 21
-S21====
-0x123456
-E21====
-
-0x124456
-
-
-# Test 22
-S22====
-0b1
-0b1
-E22====
-
-0b10
-0b10
-
-0b10
-0b10
-
-
-# Test 23
-S23====
-0b1001
-E23====
-
-0b1011
-
-
-
-# Test 24
-S24====
-0x0b1001
-E24====
-
-0x0b1002
-
-
-
-# Test 25
-S25====
-0b1001a
-E25====
-
-0b1010a
-
-
-
-# Test 26
-S26====
-0b11111111111111111111111111111110
-E26====
-
-0b11111111111111111111111111111111
-
-
-ENDTEST
-
@@ -0,0 +1,561 @@
+" Tests for using Ctrl-A/Ctrl-X on visual selections
+
+func SetUp()
+  new dummy
+  set nrformats&vim
+endfunc
+
+func TearDown()
+  bwipe!
+endfunc
+
+" 1) Ctrl-A on visually selected number
+" Text:
+" foobar-10
+"     Expected:
+"     1)    Ctrl-A on start of line:
+"     foobar-9
+"     2)    Ctrl-A on visually selected "-10":
+"     foobar-9
+"     3)    Ctrl-A on visually selected "10":
+"     foobar-11
+"     4)    Ctrl-X on visually selected "-10"
+"     foobar-11
+"     5)    Ctrl-X on visually selected "10"
+"     foobar-9
+func Test_visual_increment_01()
+  call setline(1, repeat(["foobaar-10"], 5))
+
+  call cursor(1, 1)
+  exec "norm! \<C-A>"
+  call assert_equal("foobaar-9", getline('.'))
+  call assert_equal([0, 1, 9, 0], getpos('.'))
+
+  call cursor(2, 1)
+  exec "norm! f-v$\<C-A>"
+  call assert_equal("foobaar-9", getline('.'))
+  call assert_equal([0, 2, 8, 0], getpos('.'))
+
+  call cursor(3, 1)
+  exec "norm! f1v$\<C-A>"
+  call assert_equal("foobaar-11", getline('.'))
+  call assert_equal([0, 3, 9, 0], getpos('.'))
+
+  call cursor(4, 1)
+  exec "norm! f-v$\<C-X>"
+  call assert_equal("foobaar-11", getline('.'))
+  call assert_equal([0, 4, 8, 0], getpos('.'))
+
+  call cursor(5, 1)
+  exec "norm! f1v$\<C-X>"
+  call assert_equal("foobaar-9", getline('.'))
+  call assert_equal([0, 5, 9, 0], getpos('.'))
+endfunc
+
+" 2) Ctrl-A on visually selected lines
+" Text:
+" 10
+" 20
+" 30
+" 40
+"
+"     Expected:
+"     1) Ctrl-A on visually selected lines:
+" 11
+" 21
+" 31
+" 41
+"
+"     2) Ctrl-X on visually selected lines:
+" 9
+" 19
+" 29
+" 39
+func Test_visual_increment_02()
+  call setline(1, ["10", "20", "30", "40"])
+  exec "norm! GV3k$\<C-A>"
+  call assert_equal(["11", "21", "31", "41"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+
+  call setline(1, ["10", "20", "30", "40"])
+  exec "norm! GV3k$\<C-X>"
+  call assert_equal(["9", "19", "29", "39"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 3) g Ctrl-A on visually selected lines, with non-numbers in between
+" Text:
+" 10
+"
+" 20
+"
+" 30
+"
+" 40
+"
+"     Expected:
+"     1) 2 g Ctrl-A on visually selected lines:
+" 12
+"
+" 24
+"
+" 36
+"
+" 48
+"     2) 2 g Ctrl-X on visually selected lines
+" 8
+"
+" 16
+"
+" 24
+"
+" 32
+func Test_visual_increment_03()
+  call setline(1, ["10", "", "20", "", "30", "", "40"])
+  exec "norm! GV6k2g\<C-A>"
+  call assert_equal(["12", "", "24", "", "36", "", "48"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+
+  call setline(1, ["10", "", "20", "", "30", "", "40"])
+  exec "norm! GV6k2g\<C-X>"
+  call assert_equal(["8", "", "16", "", "24", "", "32"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 4) Ctrl-A on non-number
+" Text:
+" foobar-10
+"     Expected:
+"     1) visually select foobar:
+"     foobar-10
+func Test_visual_increment_04()
+  call setline(1, ["foobar-10"])
+  exec "norm! vf-\<C-A>"
+  call assert_equal(["foobar-10"], getline(1, '$'))
+  " NOTE: I think this is correct behavior...
+  "call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 5) g<Ctrl-A> on letter
+" Test:
+" a
+" a
+" a
+" a
+"     Expected:
+"     1) g Ctrl-A on visually selected lines
+"     b
+"     c
+"     d
+"     e
+func Test_visual_increment_05()
+  set nrformats+=alpha
+  call setline(1, repeat(["a"], 4))
+  exec "norm! GV3kg\<C-A>"
+  call assert_equal(["b", "c", "d", "e"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 6) g<Ctrl-A> on letter
+" Test:
+" z
+" z
+" z
+" z
+"     Expected:
+"     1) g Ctrl-X on visually selected lines
+"     y
+"     x
+"     w
+"     v
+func Test_visual_increment_06()
+  set nrformats+=alpha
+  call setline(1, repeat(["z"], 4))
+  exec "norm! GV3kg\<C-X>"
+  call assert_equal(["y", "x", "w", "v"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 7) <Ctrl-A> on letter
+" Test:
+" 2
+" 1
+" 0
+" -1
+" -2
+"
+"     Expected:
+"     1) Ctrl-A on visually selected lines
+"     3
+"     2
+"     1
+"     0
+"     -1
+"
+"     2) Ctrl-X on visually selected lines
+"     1
+"     0
+"     -1
+"     -2
+"     -3
+func Test_visual_increment_07()
+  call setline(1, ["2", "1", "0", "-1", "-2"])
+  exec "norm! GV4k\<C-A>"
+  call assert_equal(["3", "2", "1", "0", "-1"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+
+  call setline(1, ["2", "1", "0", "-1", "-2"])
+  exec "norm! GV4k\<C-X>"
+  call assert_equal(["1", "0", "-1", "-2", "-3"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 8) Block increment on 0x9
+" Text:
+" 0x9
+" 0x9
+"     Expected:
+"     1) Ctrl-A on visually block selected region (cursor at beginning):
+"     0xa
+"     0xa
+"     2) Ctrl-A on visually block selected region (cursor at end)
+"     0xa
+"     0xa
+func Test_visual_increment_08()
+  call setline(1, repeat(["0x9"], 2))
+  exec "norm! \<C-V>j$\<C-A>"
+  call assert_equal(["0xa", "0xa"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+
+  call setline(1, repeat(["0x9"], 2))
+  exec "norm! gg$\<C-V>+\<C-A>"
+  call assert_equal(["0xa", "0xa"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 9) Increment and redo
+" Text:
+" 2
+" 2
+"
+" 3
+" 3
+"
+"     Expected:
+"     1) 2 Ctrl-A on first 2 visually selected lines
+"     4
+"     4
+"     2) redo (.) on 3
+"     5
+"     5
+func Test_visual_increment_09()
+  call setline(1, ["2", "2", "", "3", "3", ""])
+  exec "norm! ggVj2\<C-A>"
+  call assert_equal(["4", "4", "", "3", "3", ""], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+
+  exec "norm! 3j."
+  call assert_equal(["4", "4", "", "5", "5", ""], getline(1, '$'))
+  call assert_equal([0, 4, 1, 0], getpos('.'))
+endfunc
+
+" 10) sequentially decrement 1
+" Text:
+" 1
+" 1
+" 1
+" 1
+"     Expected:
+"     1) g Ctrl-X on visually selected lines
+"     0
+"     -1
+"     -2
+"     -3
+func Test_visual_increment_10()
+  call setline(1, repeat(["1"], 4))
+  exec "norm! GV3kg\<C-X>"
+  call assert_equal(["0", "-1", "-2", "-3"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 11) visually block selected indented lines
+" Text:
+"     1
+" 1
+"     1
+"     1
+"     Expexted:
+"     1) g Ctrl-A on block selected indented lines
+"     2
+" 1
+"     3
+"     4
+func Test_visual_increment_11()
+  call setline(1, ["    1", "1", "    1", "    1"])
+  exec "norm! f1\<C-V>3jg\<C-A>"
+  call assert_equal(["    2", "1", "    3", "    4"], getline(1, '$'))
+  call assert_equal([0, 1, 5, 0], getpos('.'))
+endfunc
+
+" 12) visually selected several columns
+" Text:
+" 0 0
+" 0 0
+" 0 0
+"     Expected:
+"     1) 'v' select last zero and first zeroes
+"     0 1
+"     1 0
+"     1 0
+func Test_visual_increment_12()
+  call setline(1, repeat(["0 0"], 3))
+  exec "norm! $v++\<C-A>"
+  call assert_equal(["0 1", "1 0", "1 0"], getline(1, '$'))
+  call assert_equal([0, 1, 3, 0], getpos('.'))
+endfunc
+
+" 13) visually selected part of columns
+" Text:
+" max: 100px
+" max: 200px
+" max: 300px
+" max: 400px
+"     Expected:
+"     1) 'v' on first two numbers Ctrl-A
+"     max: 110px
+"     max: 220px
+"     max: 330px
+"     max: 400px
+"     2) 'v' on first two numbers Ctrl-X
+"     max: 90px
+"     max: 190px
+"     max: 290px
+"     max: 400px
+func Test_visual_increment_13()
+  call setline(1, ["max: 100px", "max: 200px", "max: 300px", "max: 400px"])
+  exec "norm! f1\<C-V>l2j\<C-A>"
+  call assert_equal(["max: 110px", "max: 210px", "max: 310px", "max: 400px"], getline(1, '$'))
+  call assert_equal([0, 1, 6, 0], getpos('.'))
+
+  call setline(1, ["max: 100px", "max: 200px", "max: 300px", "max: 400px"])
+  exec "norm! ggf1\<C-V>l2j\<C-X>"
+  call assert_equal(["max: 90px", "max: 190px", "max: 290px", "max: 400px"], getline(1, '$'))
+  call assert_equal([0, 1, 6, 0], getpos('.'))
+endfunc
+
+" 14) redo in block mode
+" Text:
+" 1 1
+" 1 1
+"     Expected:
+"     1) Ctrl-a on first column, redo on second column
+"     2 2
+"     2 2
+func Test_visual_increment_14()
+  call setline(1, repeat(["1 1"], 2))
+  exec "norm! G\<C-V>k\<C-A>w."
+  call assert_equal(["2 2", "2 2"], getline(1, '$'))
+  call assert_equal([0, 1, 3, 0], getpos('.'))
+endfunc
+
+" 15) block select single numbers
+" Text:
+" 101
+"     Expected:
+"     1) Ctrl-a on visually selected zero
+"     111
+func Test_visual_increment_15()
+  call setline(1, ["101"])
+  exec "norm! lv\<C-A>"
+  call assert_equal(["111"], getline(1, '$'))
+  call assert_equal([0, 1, 2, 0], getpos('.'))
+endfunc
+
+" 16) increment right aligned numbers
+" Text:
+"    1
+"   19
+"  119
+"     Expected:
+"     1) Ctrl-a on line selected region
+"        2
+"       20
+"      120
+func Test_visual_increment_16()
+  call setline(1, ["   1", "  19", " 119"])
+  exec "norm! VG\<C-A>"
+  call assert_equal(["   2", "  20", " 120"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 17) block-wise increment and redo
+" Text:
+"   100
+"   1
+"
+"   100
+"   1
+"
+"   Expected:
+"   1) Ctrl-V j $ on first block, afterwards '.' on second
+"   101
+"   2
+"
+"   101
+"   2
+func Test_visual_increment_17()
+  call setline(1, [" 100", " 1", "", " 100", " 1"])
+  exec "norm! \<C-V>j$\<C-A>2j."
+  call assert_equal([" 101", " 2", "", " 101", " 1"], getline(1, '$'))
+  call assert_equal([0, 3, 1, 0], getpos('.'))
+endfunc
+
+" 18) repeat of g<Ctrl-a>
+" Text:
+"   0
+"   0
+"   0
+"   0
+"
+"   Expected:
+"   1) V 4j g<ctrl-a>, repeat twice afterwards with .
+"   3
+"   6
+"   9
+"   12
+func Test_visual_increment_18()
+  call setline(1, repeat(["0"], 4))
+  exec "norm! GV3kg\<C-A>"
+  exec "norm! .."
+  call assert_equal(["3", "6", "9", "12"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 19) increment on number with nrformat including alpha
+" Text:
+"  1
+"  1a
+"
+"  Expected:
+"  1) <Ctrl-V>j$ <ctrl-a>
+"  2
+"  2a
+func Test_visual_increment_19()
+  set nrformats+=alpha
+  call setline(1, ["1", "1a"])
+  exec "norm! \<C-V>G$\<C-A>"
+  call assert_equal(["2", "2a"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 20) increment a single letter
+" Text:
+"  a
+"
+"  Expected:
+"  1) <Ctrl-a> and cursor is on a
+"  b
+func Test_visual_increment_20()
+  set nrformats+=alpha
+  call setline(1, ["a"])
+  exec "norm! \<C-A>"
+  call assert_equal(["b"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 21) block-wise increment on part of hexadecimal
+" Text:
+" 0x123456
+"
+"   Expected:
+"   1) Ctrl-V f3 <ctrl-a>
+" 0x124456
+func Test_visual_increment_21()
+  call setline(1, ["0x123456"])
+  exec "norm! \<C-V>f3\<C-A>"
+  call assert_equal(["0x124456"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 22) Block increment on 0b0
+" Text:
+" 0b1
+" 0b1
+"     Expected:
+"     1) Ctrl-A on visually block selected region (cursor at beginning):
+"     0b10
+"     0b10
+"     2) Ctrl-A on visually block selected region (cursor at end)
+"     0b10
+"     0b10
+func Test_visual_increment_22()
+  call setline(1, repeat(["0b1"], 2))
+  exec "norm! \<C-V>j$\<C-A>"
+  call assert_equal(repeat(["0b10"], 2), getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+
+  call setline(1, repeat(["0b1"], 2))
+  exec "norm! $\<C-V>+\<C-A>"
+  call assert_equal(repeat(["0b10"], 2), getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 23) block-wise increment on part of binary
+" Text:
+" 0b1001
+"
+"   Expected:
+"   1) Ctrl-V 5l <ctrl-a>
+" 0b1011
+func Test_visual_increment_23()
+  call setline(1, ["0b1001"])
+  exec "norm! \<C-V>4l\<C-A>"
+  call assert_equal(["0b1011"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 24) increment hexadecimal
+" Text:
+" 0x0b1001
+"
+"   Expected:
+"   1) <ctrl-a>
+" 0x0b1002
+func Test_visual_increment_24()
+  call setline(1, ["0x0b1001"])
+  exec "norm! \<C-V>$\<C-A>"
+  call assert_equal(["0x0b1002"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 25) increment binary with nrformats including alpha
+" Text:
+" 0b1001a
+"
+"   Expected:
+"   1) <ctrl-a>
+" 0b1010a
+func Test_visual_increment_25()
+  set nrformats+=alpha
+  call setline(1, ["0b1001a"])
+  exec "norm! \<C-V>$\<C-A>"
+  call assert_equal(["0b1010a"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" 26) increment binary with 32 bits
+" Text:
+" 0b11111111111111111111111111111110
+"
+"   Expected:
+"   1) <ctrl-a>
+" 0b11111111111111111111111111111111
+func Test_visual_increment_26()
+  set nrformats+=alpha
+  call setline(1, ["0b11111111111111111111111111111110"])
+  exec "norm! \<C-V>$\<C-A>"
+  call assert_equal(["0b11111111111111111111111111111111"], getline(1, '$'))
+  call assert_equal([0, 1, 1, 0], getpos('.'))
+endfunc
+
+" vim: tabstop=2 shiftwidth=2 expandtab
@@ -72,7 +72,7 @@ endfunction

 " Tests for the :colder, :cnewer, :lolder and :lnewer commands
 " Note that this test assumes that a quickfix/location list is
-" already set by previous tests
+" already set by the caller.
 function XageTests(cchar)
  let Xolder = a:cchar . 'older'
  let Xnewer = a:cchar . 'newer'
@@ -116,7 +116,11 @@ function XageTests(cchar)
 endfunction

 function Test_cage()
+  let list = [{'bufnr': 1, 'lnum': 1}]
+  call setqflist(list)
  call XageTests('c')
+
+  call setloclist(0, list)
  call XageTests('l')
 endfunction

@@ -274,35 +278,35 @@ function Test_cbuffer()
 endfunction

 function Test_nomem()
-  call alloc_fail(1, 0, 0)
+  call alloc_fail(GetAllocId('qf_dirname_start'), 0, 0)
  try
    vimgrep vim runtest.vim
  catch
    call assert_true(v:exception =~ 'E342')
  endtry

-  call alloc_fail(2, 0, 0)
+  call alloc_fail(GetAllocId('qf_dirname_now'), 0, 0)
  try
    vimgrep vim runtest.vim
  catch
    call assert_true(v:exception =~ 'E342')
  endtry

-  call alloc_fail(3, 0, 0)
+  call alloc_fail(GetAllocId('qf_namebuf'), 0, 0)
  try
    cfile runtest.vim
  catch
    call assert_true(v:exception =~ 'E342')
  endtry

-  call alloc_fail(4, 0, 0)
+  call alloc_fail(GetAllocId('qf_errmsg'), 0, 0)
  try
    cfile runtest.vim
  catch
    call assert_true(v:exception =~ 'E342')
  endtry

-  call alloc_fail(5, 0, 0)
+  call alloc_fail(GetAllocId('qf_pattern'), 0, 0)
  try
    cfile runtest.vim
  catch
@@ -756,6 +756,26 @@ static char *(features[]) =

 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1073,
+/**/
+    1072,
+/**/
+    1071,
+/**/
+    1070,
+/**/
+    1069,
+/**/
+    1068,
+/**/
+    1067,
+/**/
+    1066,
+/**/
+    1065,
+/**/
+    1064,
 /**/
    1063,
 /**/
@@ -1768,6 +1768,8 @@ typedef int proftime_T;	    /* dummy for function prototypes */

 #include "structs.h"	    /* file that defines many structures */

+#include "alloc.h"
+
 /* Values for "do_profiling". */
 #define PROF_NONE	0	/* profiling not started */
 #define PROF_YES	1	/* profiling busy */