updated for version 7.0095

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 25
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -36,7 +36,7 @@ done, the features in this document are not available.  See |+eval| and
 
 1.1 Variable types ~
 							*E712*
-There are four types of variables:
+There are five types of variables:
 
 Number		A 32 bit signed number.
 		Examples:  -123  0x10  0177
@@ -50,6 +50,10 @@ Funcref		A reference to a function |Funcref|.
 List		An ordered sequence of items |List|.
 		Example: [1, 2, ['a', 'b']]
 
+Dictionary	An associative, unordered array: Each entry has a key and a
+		value. |Dictionary|
+		Example: {'blue': "#0000ff", 'red': "#ff0000"}
+
 The Number and String types are converted automatically, depending on how they
 are used.
 
@@ -2376,6 +2380,17 @@ function({name})					*function()* *E700*
 		{name} can be a user defined function or an internal function.
 
 
+garbagecollect()					*garbagecollect()*
+		Cleanup unused Lists and Dictionaries that have circular
+		references.  There is hardly ever a need to invoke this
+		function, as it is automatically done when Vim runs out of
+		memory or is waiting for the user to press a key after
+		'updatetime'.  Items without circular references are always
+		freed when they become unused.
+		This is useful if you have deleted a very big List and/or
+		Dictionary with circular references in a script that runs for
+		a long time.
+
 get({list}, {idx} [, {default}])			*get()*
 		Get item {idx} from List {list}.  When this item is not
 		available return {default}.  Return zero when {default} is

src/misc2.c

@@ -871,6 +871,9 @@ lalloc(size, message)
 	    break;
 	releasing = TRUE;
 	try_again = mf_release_all();
+#ifdef FEAT_EVAL
+	try_again |= garbage_collect();
+#endif
 	releasing = FALSE;
 	if (!try_again)
 	    break;

src/os_msdos.c

@@ -1045,9 +1045,8 @@ mch_inchar(
 		buf[2] = (int)KE_CURSORHOLD;
 		return 3;
 	    }
-	    else
 #endif
-		updatescript(0);
+	    before_blocking();
 	}
     }
     WaitForChar(FOREVER);	/* wait for key or mouse click */

src/proto/eval.pro

@@ -38,6 +38,7 @@ int do_unlet __ARGS((char_u *name, int forceit));
 void del_menutrans_vars __ARGS((void));
 char_u *get_user_var_name __ARGS((expand_T *xp, int idx));
 int list_append_dict __ARGS((list_T *list, dict_T *dict));
+int garbage_collect __ARGS((void));
 dict_T *dict_alloc __ARGS((void));
 int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
 char_u *get_dict_string __ARGS((dict_T *d, char_u *key));

src/proto/getchar.pro

@@ -33,6 +33,7 @@ void restore_typeahead __ARGS((tasave_T *tp));
 void openscript __ARGS((char_u *name, int directly));
 void close_all_scripts __ARGS((void));
 int using_script __ARGS((void));
+void before_blocking __ARGS((void));
 void updatescript __ARGS((int c));
 int vgetc __ARGS((void));
 int safe_vgetc __ARGS((void));

src/spell/en_GB.diff

@@ -1,11 +1,11 @@
 *** en_GB.orig.aff	Fri Apr 15 13:20:36 2005
---- en_GB.aff	Thu Jun 23 17:43:30 2005
+--- en_GB.aff	Mon Jun 27 19:42:42 2005
 ***************
 *** 7,9 ****
   SET ISO8859-1
 ! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
   REP 24
---- 7,17 ----
+--- 7,19 ----
   SET ISO8859-1
 ! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ! 
@@ -13,6 +13,8 @@
 ! LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ! UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ! 
+! MIDWORD	'
+! 
 ! RAR ?
 ! BAD !
 ! 
@@ -39,7 +41,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 42,61 ----
+--- 44,63 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -457,7 +459,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 65,459 ----
+--- 67,461 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1541,7 +1543,7 @@
 ! SFX 3 0 ist's [aeioubp]y 
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
---- 466,1272 ----
+--- 468,1274 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2350,7 +2352,7 @@
 ! SAL ZZ-                  _
 ! SAL Z                    S
 *** en_GB.orig.dic	Sun Apr 17 18:08:50 2005
---- en_GB.dic	Wed Jun 22 14:06:46 2005
+--- en_GB.dic	Mon Jun 27 09:31:17 2005
 ***************
 *** 187,189 ****
   aitch/SM
@@ -2607,10 +2609,11 @@
 --- 43656,43657 ----
 ***************
 *** 46148 ****
---- 46138,46143 ----
+--- 46138,46144 ----
   <20>
 + the the/!
 + a a/!
 + a an/!
 + an a/!
 + an an/!
++ PayPal

src/spell/en_US.diff

@@ -1,13 +1,15 @@
 *** en_US.orig.aff	Fri Apr 15 13:20:36 2005
---- en_US.aff	Thu Jun 23 17:42:05 2005
+--- en_US.aff	Mon Jun 27 19:42:49 2005
 ***************
 *** 3,4 ****
---- 3,11 ----
+--- 3,13 ----
   
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + 
++ MIDWORD	'
++ 
 + RAR ?
 + BAD !
 + 
@@ -18,7 +20,7 @@
 ! SFX N   y     ication    y 
 ! SFX N   0     en         [^ey] 
   
---- 37,40 ----
+--- 39,42 ----
   SFX N   e     ion        e
 ! SFX N   y     ication    y
 ! SFX N   0     en         [^ey]
@@ -28,7 +30,7 @@
   SFX H   y     ieth       y
 ! SFX H   0     th         [^y] 
   
---- 47,49 ----
+--- 49,51 ----
   SFX H   y     ieth       y
 ! SFX H   0     th         [^y]
   
@@ -37,20 +39,20 @@
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e] 
   
---- 54,56 ----
+--- 56,58 ----
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e]
   
 ***************
 *** 137,138 ****
---- 144,147 ----
+--- 146,149 ----
   REP uy i
 + REP y ie
 + REP ie y
   REP i ee
 ***************
 *** 188 ****
---- 197,318 ----
+--- 199,320 ----
   REP shun cion
 + 
 + MAP 5
@@ -174,7 +176,7 @@
 + SAL ZZ-                  _
 + SAL Z                    S
 *** en_US.orig.dic	Fri Apr 15 13:20:36 2005
---- en_US.dic	Wed Jun 22 14:06:29 2005
+--- en_US.dic	Mon Jun 27 09:31:21 2005
 ***************
 *** 5944,5946 ****
   bk
@@ -534,7 +536,7 @@
   Zubenelgenubi/M
 ***************
 *** 62077 ****
---- 62076,62082 ----
+--- 62076,62083 ----
   zymurgy/S
 + nd
 + the the/!
@@ -542,3 +544,4 @@
 + a an/!
 + an a/!
 + an an/!
++ PayPal

src/spell/fr_FR.diff

@@ -1,17 +1,19 @@
 *** fr_FR.orig.aff	Sun Apr 14 17:18:22 2002
---- fr_FR.aff	Sat Jun 25 15:12:00 2005
+--- fr_FR.aff	Mon Jun 27 19:42:54 2005
 ***************
 *** 3,4 ****
---- 3,8 ----
+--- 3,10 ----
   
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ MIDWORD	'
 + 
   PFX A Y 10
 ***************
 *** 691,692 ****
---- 695,707 ----
+--- 697,709 ----
   
 + 
 + MAP 5

src/spell/nl_NL.diff

@@ -1,14 +1,18 @@
 *** nl_NL.orig.aff	Wed Apr 20 11:48:16 2005
---- nl_NL.aff	Thu Jun 23 20:52:18 2005
+--- nl_NL.aff	Mon Jun 27 22:07:02 2005
 ***************
 *** 3,4 ****
---- 3,10 ----
+--- 3,14 ----
   
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + 
++ MIDWORD	'-
++ 
 + KEP =
++ RAR ?
++ BAD !
 + 
   NOSPLITSUGS
 ***************
@@ -33,7 +37,7 @@
 ! SFX J 0 je [aeiou][bcdfgkpt] 
 ! SFX J 0 jes [aeiou][bcdfgkpt] 
   
---- 39,58 ----
+--- 43,62 ----
   SFX J N 18
 ! SFX J 0 tje [aeiou][aeiou]
 ! SFX J 0 tjes [aeiou][aeiou]
@@ -59,7 +63,7 @@
   REP ubi ibu
 ! REP croc krok 
   REP ten than
---- 259,261 ----
+--- 263,265 ----
   REP ubi ibu
 ! REP croc krok
   REP ten than
@@ -68,7 +72,7 @@
   REP capucino cappuccino
 ! REP celcius Celsius 
   REP kado cadeau
---- 294,296 ----
+--- 298,300 ----
   REP capucino cappuccino
 ! REP celcius Celsius
   REP kado cadeau
@@ -81,7 +85,7 @@
   REP kommittee comit<69>
 ! REP kwis quiz 
   REP kwissen quizzen
---- 300,306 ----
+--- 304,310 ----
   REP committee comit<69>
 ! REP komitee comit<69>
 ! REP komittee comit<69>
@@ -94,7 +98,7 @@
   REP copy kopij
 ! REP pitoresque pittoreske 
   REP reikweite reikwijdte
---- 308,310 ----
+--- 312,314 ----
   REP copy kopij
 ! REP pitoresque pittoreske
   REP reikweite reikwijdte
@@ -106,7 +110,7 @@
 ! REP kontekst context 
 ! REP korrekt correct 
   REP kritikus criticus
---- 320,325 ----
+--- 324,329 ----
   REP klup club
 ! REP wiskid whizzkid
 ! REP kontakt contact
@@ -115,7 +119,7 @@
   REP kritikus criticus
 ***************
 *** 333 ****
---- 339,462 ----
+--- 343,466 ----
   REP aflassen afgelasten
 + REP svp s.v.p.
 + REP zoz z.o.z.
@@ -241,7 +245,7 @@
 + SAL ZZ-                  _
 + SAL Z                    S
 *** nl_NL.orig.dic	Tue Apr 19 21:03:15 2005
---- nl_NL.dic	Fri Jun 24 15:42:29 2005
+--- nl_NL.dic	Mon Jun 27 20:38:35 2005
 ***************
 *** 1,3 ****
   119937
@@ -335,7 +339,7 @@
   uchtend/N
 ***************
 *** 119938 ****
---- 119962,120136 ----
+--- 119962,120135 ----
   <20>berhaupt
 + Christiaan/X
 + Fred/X
@@ -360,7 +364,6 @@
 + art nouveau
 + au bain marie
 + auctor intellectualis
-+ auctor intellectualis
 + avant la lettre
 + bal masqu<71>
 + basso continuo

src/structs.h

@@ -1020,16 +1020,18 @@ struct listwatch_S
  */
 struct listvar_S
 {
-    int		lv_refcount;	/* reference count */
-    int		lv_len;		/* number of items */
     listitem_T	*lv_first;	/* first item, NULL if none */
     listitem_T	*lv_last;	/* last item, NULL if none */
+    int		lv_refcount;	/* reference count */
+    int		lv_len;		/* number of items */
     listwatch_T	*lv_watch;	/* first watcher, NULL if none */
     int		lv_idx;		/* cached index of an item */
     listitem_T	*lv_idx_item;	/* when not NULL item at index "lv_idx" */
     int		lv_copyID;	/* ID used by deepcopy() */
     list_T	*lv_copylist;	/* copied list used by deepcopy() */
     char	lv_lock;	/* zero, VAR_LOCKED, VAR_FIXED */
+    list_T	*lv_used_next;	/* next list in used dicts list */
+    list_T	*lv_used_prev;	/* previous list in used lists list */
 };
 
 /*
@@ -1061,6 +1063,8 @@ struct dictvar_S
     int		dv_copyID;	/* ID used by deepcopy() */
     dict_T	*dv_copydict;	/* copied dict used by deepcopy() */
     char	dv_lock;	/* zero, VAR_LOCKED, VAR_FIXED */
+    dict_T	*dv_used_next;	/* next dict in used dicts list */
+    dict_T	*dv_used_prev;	/* previous dict in used dicts list */
 };
 
 

src/version.h

@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 26)"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 27)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 26, compiled "
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 27, compiled "