4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
11 Problem: Cannot store Dict and List in viminfo file.
12 Solution: Add support for this. (Christian Brabandt)
13 Files: runtime/doc/options.txt, src/eval.c, src/testdir/Make_amiga.mak,
14 src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
15 src/testdir/Make_os2.mak, src/testdir/Make_vms.mms,
16 src/testdir/Makefile, src/testdir/main.aap, src/testdir/test74.in,
20 *** ../vim-7.3.029/runtime/doc/options.txt 2010-08-15 21:57:17.000000000 +0200
21 --- runtime/doc/options.txt 2010-10-20 17:41:18.000000000 +0200
24 ! When included, save and restore global variables that start
25 with an uppercase letter, and don't contain a lowercase
26 letter. Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
27 ! and "_K_L_M" are not. Only String and Number types are
29 " Maximum number of lines saved for each register. Old name of
30 the '<' item, with the disadvantage that you need to put a
31 backslash before the ", otherwise it will be recognized as the
33 ! When included, save and restore global variables that start
34 with an uppercase letter, and don't contain a lowercase
35 letter. Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
36 ! and "_K_L_M" are not. Nested List and Dict items may not be
37 ! read back correctly, you end up with a string representation
39 " Maximum number of lines saved for each register. Old name of
40 the '<' item, with the disadvantage that you need to put a
41 backslash before the ", otherwise it will be recognized as the
42 *** ../vim-7.3.029/src/eval.c 2010-09-14 12:47:30.000000000 +0200
43 --- src/eval.c 2010-10-20 16:25:54.000000000 +0200
48 *tab++ = '\0'; /* isolate the variable name */
49 ! if (*tab == 'S') /* string var */
52 ! else if (*tab == 'F')
56 tab = vim_strchr(tab, '\t');
60 ! if (type == VAR_STRING)
61 tv.vval.v_string = viminfo_readstring(virp,
62 (int)(tab - virp->vir_line + 1), TRUE);
67 *tab++ = '\0'; /* isolate the variable name */
70 ! case 'S': type = VAR_STRING; break;
72 ! case 'F': type = VAR_FLOAT; break;
74 + case 'D': type = VAR_DICT; break;
75 + case 'L': type = VAR_LIST; break;
78 tab = vim_strchr(tab, '\t');
82 ! if (type == VAR_STRING || type == VAR_DICT || type == VAR_LIST)
83 tv.vval.v_string = viminfo_readstring(virp,
84 (int)(tab - virp->vir_line + 1), TRUE);
90 tv.vval.v_number = atol((char *)tab + 1);
91 set_var(virp->vir_line + 1, &tv, FALSE);
92 ! if (type == VAR_STRING)
93 vim_free(tv.vval.v_string);
100 tv.vval.v_number = atol((char *)tab + 1);
101 + if (type == VAR_DICT || type == VAR_LIST)
103 + typval_T *etv = eval_expr(tv.vval.v_string, NULL);
106 + /* Failed to parse back the dict or list, use it as a
108 + tv.v_type = VAR_STRING;
111 + vim_free(tv.vval.v_string);
116 set_var(virp->vir_line + 1, &tv, FALSE);
118 ! if (tv.v_type == VAR_STRING)
119 vim_free(tv.vval.v_string);
120 + else if (tv.v_type == VAR_DICT || tv.v_type == VAR_LIST)
127 case VAR_STRING: s = "STR"; break;
128 case VAR_NUMBER: s = "NUM"; break;
130 ! case VAR_FLOAT: s = "FLO"; break;
134 fprintf(fp, "!%s\t%s\t", this_var->di_key, s);
136 case VAR_STRING: s = "STR"; break;
137 case VAR_NUMBER: s = "NUM"; break;
139 ! case VAR_FLOAT: s = "FLO"; break;
141 + case VAR_DICT: s = "DIC"; break;
142 + case VAR_LIST: s = "LIS"; break;
145 fprintf(fp, "!%s\t%s\t", this_var->di_key, s);
146 *** ../vim-7.3.029/src/testdir/Make_amiga.mak 2010-08-15 21:57:29.000000000 +0200
147 --- src/testdir/Make_amiga.mak 2010-10-20 16:27:19.000000000 +0200
150 test56.out test57.out test58.out test59.out test60.out \
151 test61.out test62.out test63.out test64.out test65.out \
152 test66.out test67.out test68.out test69.out test70.out \
153 ! test71.out test72.out test73.out
158 test56.out test57.out test58.out test59.out test60.out \
159 test61.out test62.out test63.out test64.out test65.out \
160 test66.out test67.out test68.out test69.out test70.out \
161 ! test71.out test72.out test73.out test74.out
168 test71.out: test71.in
169 test72.out: test72.in
170 test73.out: test73.in
171 + test74.out: test74.in
172 *** ../vim-7.3.029/src/testdir/Make_dos.mak 2010-08-15 21:57:29.000000000 +0200
173 --- src/testdir/Make_dos.mak 2010-10-20 16:13:35.000000000 +0200
176 test30.out test31.out test32.out test33.out test34.out \
177 test37.out test38.out test39.out test40.out test41.out \
178 test42.out test52.out test65.out test66.out test67.out \
179 ! test68.out test69.out test71.out test72.out test73.out
181 SCRIPTS32 = test50.out test70.out
184 test30.out test31.out test32.out test33.out test34.out \
185 test37.out test38.out test39.out test40.out test41.out \
186 test42.out test52.out test65.out test66.out test67.out \
187 ! test68.out test69.out test71.out test72.out test73.out \
190 SCRIPTS32 = test50.out test70.out
192 *** ../vim-7.3.029/src/testdir/Make_ming.mak 2010-08-15 21:57:29.000000000 +0200
193 --- src/testdir/Make_ming.mak 2010-10-20 16:26:54.000000000 +0200
196 test30.out test31.out test32.out test33.out test34.out \
197 test37.out test38.out test39.out test40.out test41.out \
198 test42.out test52.out test65.out test66.out test67.out \
199 ! test68.out test69.out test71.out test72.out test72.out
201 SCRIPTS32 = test50.out test70.out
204 test30.out test31.out test32.out test33.out test34.out \
205 test37.out test38.out test39.out test40.out test41.out \
206 test42.out test52.out test65.out test66.out test67.out \
207 ! test68.out test69.out test71.out test72.out test73.out \
210 SCRIPTS32 = test50.out test70.out
212 *** ../vim-7.3.029/src/testdir/Make_os2.mak 2010-08-15 21:57:29.000000000 +0200
213 --- src/testdir/Make_os2.mak 2010-10-20 16:13:35.000000000 +0200
216 test56.out test57.out test58.out test59.out test60.out \
217 test61.out test62.out test63.out test64.out test65.out \
218 test66.out test67.out test68.out test69.out test70.out \
219 ! test71.out test72.out test73.out
224 test56.out test57.out test58.out test59.out test60.out \
225 test61.out test62.out test63.out test64.out test65.out \
226 test66.out test67.out test68.out test69.out test70.out \
227 ! test71.out test72.out test73.out test74.out
231 *** ../vim-7.3.029/src/testdir/Make_vms.mms 2010-08-15 21:57:29.000000000 +0200
232 --- src/testdir/Make_vms.mms 2010-10-20 16:13:35.000000000 +0200
235 test56.out test57.out test60.out \
236 test61.out test62.out test63.out test64.out test65.out \
237 test66.out test67.out test68.out test69.out \
238 ! test71.out test72.out
241 # Test 30: a problem around mac format - unknown reason
243 test56.out test57.out test60.out \
244 test61.out test62.out test63.out test64.out test65.out \
245 test66.out test67.out test68.out test69.out \
246 ! test71.out test72.out test74.out
249 # Test 30: a problem around mac format - unknown reason
250 *** ../vim-7.3.029/src/testdir/Makefile 2010-09-14 12:47:30.000000000 +0200
251 --- src/testdir/Makefile 2010-10-20 16:13:35.000000000 +0200
255 # This will make testing about 10 times as slow.
256 # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$*
259 SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
260 test7.out test8.out test9.out test10.out test11.out \
261 test12.out test13.out test14.out test15.out test17.out \
264 test54.out test55.out test56.out test57.out test58.out \
265 test59.out test60.out test61.out test62.out test63.out \
266 test64.out test65.out test66.out test67.out test68.out \
267 ! test69.out test70.out test71.out test72.out test73.out
269 SCRIPTS_GUI = test16.out
272 test54.out test55.out test56.out test57.out test58.out \
273 test59.out test60.out test61.out test62.out test63.out \
274 test64.out test65.out test66.out test67.out test68.out \
275 ! test69.out test70.out test71.out test72.out test73.out \
278 SCRIPTS_GUI = test16.out
280 *** ../vim-7.3.029/src/testdir/main.aap 2010-08-15 21:57:29.000000000 +0200
281 --- src/testdir/main.aap 2010-10-20 16:13:35.000000000 +0200
284 test33.out test34.out test35.out test36.out test37.out
285 test38.out test39.out test40.out test41.out test42.out
286 test43.out test44.out test45.out test46.out test47.out
287 ! test48.out test49.out
289 ScriptsGUI = test16.out
292 test33.out test34.out test35.out test36.out test37.out
293 test38.out test39.out test40.out test41.out test42.out
294 test43.out test44.out test45.out test46.out test47.out
295 ! test48.out test49.out test74.out
297 ScriptsGUI = test16.out
299 *** ../vim-7.3.029/src/testdir/test74.in 2010-10-20 17:41:30.000000000 +0200
300 --- src/testdir/test74.in 2010-10-20 17:37:52.000000000 +0200
304 + " Tests for storing global variables in the .viminfo file vim: set ft=vim:
308 + :" Do all test in a separate window to avoid E211 when we recursively
309 + :" delete the Xfind directory during cleanup
311 + :" This will cause a few errors, do it silently.
313 + :set nocp viminfo+=!,nviminfo
314 + :let MY_GLOBAL_DICT={'foo': 1, 'bar': 0, 'longvarible': 1000}
315 + :" store a really long list, so line wrapping will occur in viminfo file
316 + :let MY_GLOBAL_LIST=range(1,100)
318 + :unlet MY_GLOBAL_DICT
319 + :unlet MY_GLOBAL_LIST
321 + :call delete('Xviminfo')
322 + :if exists("MY_GLOBAL_DICT")
324 + :echo MY_GLOBAL_DICT
327 + :if exists("MY_GLOBAL_LIST")
329 + :echo MY_GLOBAL_LIST
340 *** ../vim-7.3.029/src/testdir/test74.ok 2010-10-20 17:41:30.000000000 +0200
341 --- src/testdir/test74.ok 2010-10-20 17:36:57.000000000 +0200
346 + {'foo': 1, 'longvarible': 1000, 'bar': 0}
347 + [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100]
350 *** ../vim-7.3.029/src/version.c 2010-10-15 20:20:00.000000000 +0200
351 --- src/version.c 2010-10-20 17:23:54.000000000 +0200
355 { /* Add new patch number below this line */
361 Not too long ago, cut and paste was done with scissors and glue...
363 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
364 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
365 \\\ download, build and distribute -- http://www.A-A-P.org ///
366 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///