]>
Commit | Line | Data |
---|---|---|
1419a6f5 ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.3.005 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.005 | |
11 | Problem: Crash when using undotree(). (Christian Brabandt) | |
12 | Solution: Increase the list reference count. Add a test for undotree() | |
13 | (Lech Lorens) | |
14 | Files: src/eval.c, src/testdir/Makefile, src/testdir/test61.in | |
15 | ||
16 | ||
17 | *** ../vim-7.3.004/src/eval.c 2010-08-15 21:57:26.000000000 +0200 | |
18 | --- src/eval.c 2010-09-14 12:43:04.000000000 +0200 | |
19 | *************** | |
20 | *** 7075,7081 **** | |
21 | } | |
22 | ||
23 | /* | |
24 | ! * Add a list entry to dictionary "d". | |
25 | * Returns FAIL when out of memory and when key already exists. | |
26 | */ | |
27 | int | |
28 | --- 7075,7081 ---- | |
29 | } | |
30 | ||
31 | /* | |
32 | ! * Add a list entry to dictionary "d". | |
33 | * Returns FAIL when out of memory and when key already exists. | |
34 | */ | |
35 | int | |
36 | *************** | |
37 | *** 7097,7102 **** | |
38 | --- 7097,7103 ---- | |
39 | dictitem_free(item); | |
40 | return FAIL; | |
41 | } | |
42 | + ++list->lv_refcount; | |
43 | return OK; | |
44 | } | |
45 | ||
46 | *** ../vim-7.3.004/src/testdir/Makefile 2010-08-15 21:57:29.000000000 +0200 | |
47 | --- src/testdir/Makefile 2010-09-14 12:38:56.000000000 +0200 | |
48 | *************** | |
49 | *** 44,50 **** | |
50 | $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) | |
51 | ||
52 | clean: | |
53 | ! -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.pid* viminfo | |
54 | ||
55 | test1.out: test1.in | |
56 | -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo | |
57 | --- 44,50 ---- | |
58 | $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) | |
59 | ||
60 | clean: | |
61 | ! -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo | |
62 | ||
63 | test1.out: test1.in | |
64 | -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo | |
65 | *** ../vim-7.3.004/src/testdir/test61.in 2010-08-15 21:57:29.000000000 +0200 | |
66 | --- src/testdir/test61.in 2010-09-14 12:38:56.000000000 +0200 | |
67 | *************** | |
68 | *** 4,9 **** | |
69 | --- 4,13 ---- | |
70 | Also tests :earlier and :later. | |
71 | ||
72 | STARTTEST | |
73 | + :echo undotree().entries | |
74 | + ENDTEST | |
75 | + | |
76 | + STARTTEST | |
77 | :" Delete three characters and undo | |
78 | Gx:set ul=100 | |
79 | x:set ul=100 | |
80 | *** ../vim-7.3.004/src/version.c 2010-09-14 10:55:24.000000000 +0200 | |
81 | --- src/version.c 2010-09-14 12:39:59.000000000 +0200 | |
82 | *************** | |
83 | *** 716,717 **** | |
84 | --- 716,719 ---- | |
85 | { /* Add new patch number below this line */ | |
86 | + /**/ | |
87 | + 5, | |
88 | /**/ | |
89 | ||
90 | -- | |
91 | I'm writing a book. I've got the page numbers done. | |
92 | ||
93 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
94 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
95 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
96 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |