]>
Commit | Line | Data |
---|---|---|
d22eaa71 ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.161 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.161 | |
11 | Problem: Folds messed up in other tab page. (Vlad Irnov) | |
12 | Solution: Instead of going over all windows in current tab page go over all | |
13 | windows in all tab pages. Also free memory for location lists in | |
14 | other tab pages when exiting. (Lech Lorens) | |
15 | Files: src/fileio.c, src/mark.c, src/misc1.c, src/misc2.c | |
16 | ||
17 | ||
18 | *** ../vim-7.2.160/src/fileio.c Wed Mar 18 15:40:03 2009 | |
19 | --- src/fileio.c Wed Apr 22 15:46:35 2009 | |
20 | *************** | |
21 | *** 6846,6855 **** | |
22 | #endif | |
23 | #ifdef FEAT_FOLDING | |
24 | { | |
25 | ! win_T *wp; | |
26 | ||
27 | /* Update folds unless they are defined manually. */ | |
28 | ! FOR_ALL_WINDOWS(wp) | |
29 | if (wp->w_buffer == curwin->w_buffer | |
30 | && !foldmethodIsManual(wp)) | |
31 | foldUpdateAll(wp); | |
32 | --- 6846,6856 ---- | |
33 | #endif | |
34 | #ifdef FEAT_FOLDING | |
35 | { | |
36 | ! win_T *wp; | |
37 | ! tabpage_T *tp; | |
38 | ||
39 | /* Update folds unless they are defined manually. */ | |
40 | ! FOR_ALL_TAB_WINDOWS(tp, wp) | |
41 | if (wp->w_buffer == curwin->w_buffer | |
42 | && !foldmethodIsManual(wp)) | |
43 | foldUpdateAll(wp); | |
44 | *** ../vim-7.2.160/src/mark.c Sun Nov 9 13:43:25 2008 | |
45 | --- src/mark.c Wed Apr 22 17:32:29 2009 | |
46 | *************** | |
47 | *** 1023,1028 **** | |
48 | --- 1023,1031 ---- | |
49 | int fnum = curbuf->b_fnum; | |
50 | linenr_T *lp; | |
51 | win_T *win; | |
52 | + #ifdef FEAT_WINDOWS | |
53 | + tabpage_T *tab; | |
54 | + #endif | |
55 | ||
56 | if (line2 < line1 && amount_after == 0L) /* nothing to do */ | |
57 | return; | |
58 | *************** | |
59 | *** 1064,1070 **** | |
60 | /* quickfix marks */ | |
61 | qf_mark_adjust(NULL, line1, line2, amount, amount_after); | |
62 | /* location lists */ | |
63 | ! FOR_ALL_WINDOWS(win) | |
64 | qf_mark_adjust(win, line1, line2, amount, amount_after); | |
65 | #endif | |
66 | ||
67 | --- 1067,1073 ---- | |
68 | /* quickfix marks */ | |
69 | qf_mark_adjust(NULL, line1, line2, amount, amount_after); | |
70 | /* location lists */ | |
71 | ! FOR_ALL_TAB_WINDOWS(tab, win) | |
72 | qf_mark_adjust(win, line1, line2, amount, amount_after); | |
73 | #endif | |
74 | ||
75 | *************** | |
76 | *** 1086,1092 **** | |
77 | /* | |
78 | * Adjust items in all windows related to the current buffer. | |
79 | */ | |
80 | ! FOR_ALL_WINDOWS(win) | |
81 | { | |
82 | #ifdef FEAT_JUMPLIST | |
83 | if (!cmdmod.lockmarks) | |
84 | --- 1089,1095 ---- | |
85 | /* | |
86 | * Adjust items in all windows related to the current buffer. | |
87 | */ | |
88 | ! FOR_ALL_TAB_WINDOWS(tab, win) | |
89 | { | |
90 | #ifdef FEAT_JUMPLIST | |
91 | if (!cmdmod.lockmarks) | |
92 | *** ../vim-7.2.160/src/misc1.c Wed Mar 18 15:40:03 2009 | |
93 | --- src/misc1.c Wed Apr 22 17:32:46 2009 | |
94 | *************** | |
95 | *** 2717,2722 **** | |
96 | --- 2717,2725 ---- | |
97 | long xtra; | |
98 | { | |
99 | win_T *wp; | |
100 | + #ifdef FEAT_WINDOWS | |
101 | + tabpage_T *tp; | |
102 | + #endif | |
103 | int i; | |
104 | #ifdef FEAT_JUMPLIST | |
105 | int cols; | |
106 | *************** | |
107 | *** 2769,2775 **** | |
108 | curbuf->b_changelistlen = JUMPLISTSIZE - 1; | |
109 | mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1, | |
110 | sizeof(pos_T) * (JUMPLISTSIZE - 1)); | |
111 | ! FOR_ALL_WINDOWS(wp) | |
112 | { | |
113 | /* Correct position in changelist for other windows on | |
114 | * this buffer. */ | |
115 | --- 2772,2778 ---- | |
116 | curbuf->b_changelistlen = JUMPLISTSIZE - 1; | |
117 | mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1, | |
118 | sizeof(pos_T) * (JUMPLISTSIZE - 1)); | |
119 | ! FOR_ALL_TAB_WINDOWS(tp, wp) | |
120 | { | |
121 | /* Correct position in changelist for other windows on | |
122 | * this buffer. */ | |
123 | *************** | |
124 | *** 2777,2783 **** | |
125 | --wp->w_changelistidx; | |
126 | } | |
127 | } | |
128 | ! FOR_ALL_WINDOWS(wp) | |
129 | { | |
130 | /* For other windows, if the position in the changelist is | |
131 | * at the end it stays at the end. */ | |
132 | --- 2780,2786 ---- | |
133 | --wp->w_changelistidx; | |
134 | } | |
135 | } | |
136 | ! FOR_ALL_TAB_WINDOWS(tp, wp) | |
137 | { | |
138 | /* For other windows, if the position in the changelist is | |
139 | * at the end it stays at the end. */ | |
140 | *************** | |
141 | *** 2796,2802 **** | |
142 | #endif | |
143 | } | |
144 | ||
145 | ! FOR_ALL_WINDOWS(wp) | |
146 | { | |
147 | if (wp->w_buffer == curbuf) | |
148 | { | |
149 | --- 2799,2805 ---- | |
150 | #endif | |
151 | } | |
152 | ||
153 | ! FOR_ALL_TAB_WINDOWS(tp, wp) | |
154 | { | |
155 | if (wp->w_buffer == curbuf) | |
156 | { | |
157 | *** ../vim-7.2.160/src/misc2.c Wed Mar 11 17:27:46 2009 | |
158 | --- src/misc2.c Wed Apr 22 15:46:35 2009 | |
159 | *************** | |
160 | *** 1075,1085 **** | |
161 | ||
162 | #ifdef FEAT_QUICKFIX | |
163 | { | |
164 | ! win_T *win; | |
165 | ||
166 | qf_free_all(NULL); | |
167 | /* Free all location lists */ | |
168 | ! FOR_ALL_WINDOWS(win) | |
169 | qf_free_all(win); | |
170 | } | |
171 | #endif | |
172 | --- 1075,1086 ---- | |
173 | ||
174 | #ifdef FEAT_QUICKFIX | |
175 | { | |
176 | ! win_T *win; | |
177 | ! tabpage_T *tab; | |
178 | ||
179 | qf_free_all(NULL); | |
180 | /* Free all location lists */ | |
181 | ! FOR_ALL_TAB_WINDOWS(tab, win) | |
182 | qf_free_all(win); | |
183 | } | |
184 | #endif | |
185 | *** ../vim-7.2.160/src/version.c Wed Apr 22 18:43:06 2009 | |
186 | --- src/version.c Wed Apr 29 10:59:01 2009 | |
187 | *************** | |
188 | *** 678,679 **** | |
189 | --- 678,681 ---- | |
190 | { /* Add new patch number below this line */ | |
191 | + /**/ | |
192 | + 161, | |
193 | /**/ | |
194 | ||
195 | -- | |
196 | CONCORDE: Quickly, sir, come this way! | |
197 | LAUNCELOT: No! It's not right for my idiom. I must escape more ... more ... | |
198 | CONCORDE: Dramatically, sir? | |
199 | LAUNCELOT: Dramatically. | |
200 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
201 | ||
202 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
203 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
204 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
205 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |