|
1 To: [email protected] |
|
2 Subject: Patch 7.2.103 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
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.103 |
|
11 Problem: When 'bomb' is changed the window title is updated to show/hide a |
|
12 "+", but the tab page label isn't. (Patrick Texier) |
|
13 Solution: Set "redraw_tabline" in most places where "need_maketitle" is set. |
|
14 (partly by Lech Lorens) |
|
15 Files: src/option.c |
|
16 |
|
17 |
|
18 *** ../vim-7.2.102/src/option.c Wed Feb 4 17:27:50 2009 |
|
19 --- src/option.c Wed Feb 4 17:40:02 2009 |
|
20 *************** |
|
21 *** 5268,5273 **** |
|
22 --- 5268,5288 ---- |
|
23 } |
|
24 #endif |
|
25 |
|
26 + #ifdef FEAT_TITLE |
|
27 + static void redraw_titles __ARGS((void)); |
|
28 + |
|
29 + /* |
|
30 + * Redraw the window title and/or tab page text later. |
|
31 + */ |
|
32 + static void redraw_titles() |
|
33 + { |
|
34 + need_maketitle = TRUE; |
|
35 + # ifdef FEAT_WINDOWS |
|
36 + redraw_tabline = TRUE; |
|
37 + # endif |
|
38 + } |
|
39 + #endif |
|
40 + |
|
41 /* |
|
42 * Set a string option to a new value (without checking the effect). |
|
43 * The string is copied into allocated memory. |
|
44 *************** |
|
45 *** 5672,5678 **** |
|
46 { |
|
47 # ifdef FEAT_TITLE |
|
48 /* May show a "+" in the title now. */ |
|
49 ! need_maketitle = TRUE; |
|
50 # endif |
|
51 /* Add 'fileencoding' to the swap file. */ |
|
52 ml_setflags(curbuf); |
|
53 --- 5687,5693 ---- |
|
54 { |
|
55 # ifdef FEAT_TITLE |
|
56 /* May show a "+" in the title now. */ |
|
57 ! redraw_titles(); |
|
58 # endif |
|
59 /* Add 'fileencoding' to the swap file. */ |
|
60 ml_setflags(curbuf); |
|
61 *************** |
|
62 *** 5691,5697 **** |
|
63 { |
|
64 errmsg = mb_init(); |
|
65 # ifdef FEAT_TITLE |
|
66 ! need_maketitle = TRUE; |
|
67 # endif |
|
68 } |
|
69 } |
|
70 --- 5706,5712 ---- |
|
71 { |
|
72 errmsg = mb_init(); |
|
73 # ifdef FEAT_TITLE |
|
74 ! redraw_titles(); |
|
75 # endif |
|
76 } |
|
77 } |
|
78 *************** |
|
79 *** 5800,5806 **** |
|
80 else |
|
81 curbuf->b_p_tx = FALSE; |
|
82 #ifdef FEAT_TITLE |
|
83 ! need_maketitle = TRUE; |
|
84 #endif |
|
85 /* update flag in swap file */ |
|
86 ml_setflags(curbuf); |
|
87 --- 5815,5821 ---- |
|
88 else |
|
89 curbuf->b_p_tx = FALSE; |
|
90 #ifdef FEAT_TITLE |
|
91 ! redraw_titles(); |
|
92 #endif |
|
93 /* update flag in swap file */ |
|
94 ml_setflags(curbuf); |
|
95 *************** |
|
96 *** 7127,7148 **** |
|
97 curbuf->b_did_warn = FALSE; |
|
98 |
|
99 #ifdef FEAT_TITLE |
|
100 ! need_maketitle = TRUE; |
|
101 #endif |
|
102 } |
|
103 |
|
104 #ifdef FEAT_TITLE |
|
105 /* when 'modifiable' is changed, redraw the window title */ |
|
106 else if ((int *)varp == &curbuf->b_p_ma) |
|
107 ! need_maketitle = TRUE; |
|
108 /* when 'endofline' is changed, redraw the window title */ |
|
109 else if ((int *)varp == &curbuf->b_p_eol) |
|
110 ! need_maketitle = TRUE; |
|
111 ! #ifdef FEAT_MBYTE |
|
112 ! /* when 'bomb' is changed, redraw the window title */ |
|
113 else if ((int *)varp == &curbuf->b_p_bomb) |
|
114 ! need_maketitle = TRUE; |
|
115 ! #endif |
|
116 #endif |
|
117 |
|
118 /* when 'bin' is set also set some other options */ |
|
119 --- 7142,7169 ---- |
|
120 curbuf->b_did_warn = FALSE; |
|
121 |
|
122 #ifdef FEAT_TITLE |
|
123 ! redraw_titles(); |
|
124 #endif |
|
125 } |
|
126 |
|
127 #ifdef FEAT_TITLE |
|
128 /* when 'modifiable' is changed, redraw the window title */ |
|
129 else if ((int *)varp == &curbuf->b_p_ma) |
|
130 ! { |
|
131 ! redraw_titles(); |
|
132 ! } |
|
133 /* when 'endofline' is changed, redraw the window title */ |
|
134 else if ((int *)varp == &curbuf->b_p_eol) |
|
135 ! { |
|
136 ! redraw_titles(); |
|
137 ! } |
|
138 ! # ifdef FEAT_MBYTE |
|
139 ! /* when 'bomb' is changed, redraw the window title and tab page text */ |
|
140 else if ((int *)varp == &curbuf->b_p_bomb) |
|
141 ! { |
|
142 ! redraw_titles(); |
|
143 ! } |
|
144 ! # endif |
|
145 #endif |
|
146 |
|
147 /* when 'bin' is set also set some other options */ |
|
148 *************** |
|
149 *** 7150,7156 **** |
|
150 { |
|
151 set_options_bin(old_value, curbuf->b_p_bin, opt_flags); |
|
152 #ifdef FEAT_TITLE |
|
153 ! need_maketitle = TRUE; |
|
154 #endif |
|
155 } |
|
156 |
|
157 --- 7171,7177 ---- |
|
158 { |
|
159 set_options_bin(old_value, curbuf->b_p_bin, opt_flags); |
|
160 #ifdef FEAT_TITLE |
|
161 ! redraw_titles(); |
|
162 #endif |
|
163 } |
|
164 |
|
165 *************** |
|
166 *** 7301,7307 **** |
|
167 if (!value) |
|
168 save_file_ff(curbuf); /* Buffer is unchanged */ |
|
169 #ifdef FEAT_TITLE |
|
170 ! need_maketitle = TRUE; |
|
171 #endif |
|
172 #ifdef FEAT_AUTOCMD |
|
173 modified_was_set = value; |
|
174 --- 7322,7328 ---- |
|
175 if (!value) |
|
176 save_file_ff(curbuf); /* Buffer is unchanged */ |
|
177 #ifdef FEAT_TITLE |
|
178 ! redraw_titles(); |
|
179 #endif |
|
180 #ifdef FEAT_AUTOCMD |
|
181 modified_was_set = value; |
|
182 *************** |
|
183 *** 7736,7742 **** |
|
184 newFoldLevel(); |
|
185 } |
|
186 |
|
187 ! /* 'foldminlevel' */ |
|
188 else if (pp == &curwin->w_p_fml) |
|
189 { |
|
190 foldUpdateAll(curwin); |
|
191 --- 7757,7763 ---- |
|
192 newFoldLevel(); |
|
193 } |
|
194 |
|
195 ! /* 'foldminlines' */ |
|
196 else if (pp == &curwin->w_p_fml) |
|
197 { |
|
198 foldUpdateAll(curwin); |
|
199 *** ../vim-7.2.102/src/version.c Thu Feb 5 20:47:14 2009 |
|
200 --- src/version.c Wed Feb 11 11:32:20 2009 |
|
201 *************** |
|
202 *** 678,679 **** |
|
203 --- 678,681 ---- |
|
204 { /* Add new patch number below this line */ |
|
205 + /**/ |
|
206 + 103, |
|
207 /**/ |
|
208 |
|
209 -- |
|
210 hundred-and-one symptoms of being an internet addict: |
|
211 73. You give your dog used motherboards instead of bones |
|
212 |
|
213 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
214 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
215 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
216 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |