]>
Commit | Line | Data |
---|---|---|
6ac11130 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.327 | |
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.2.327 | |
11 | Problem: Unused functions in Workshop. | |
12 | Solution: Add "#if 0" and minor cleanup. (Dominique Pelle) | |
13 | Files: src/workshop.c, src/integration.c, src/ingegration.h | |
14 | ||
15 | ||
16 | *** ../vim-7.2.326/src/workshop.c 2009-05-21 23:25:38.000000000 +0200 | |
17 | --- src/workshop.c 2010-01-06 18:10:10.000000000 +0100 | |
18 | *************** | |
19 | *** 56,67 **** | |
20 | static void load_window(char *, int lnum); | |
21 | static void warp_to_pc(int); | |
22 | #ifdef FEAT_BEVAL | |
23 | ! void workshop_beval_cb(BalloonEval *, int); | |
24 | #endif | |
25 | static char *fixAccelText(char *); | |
26 | static void addMenu(char *, char *, char *); | |
27 | static char *lookupVerb(char *, int); | |
28 | - static int computeIndex(int, char_u *, int); | |
29 | static void coloncmd(char *, Boolean); | |
30 | ||
31 | extern Widget vimShell; | |
32 | --- 56,67 ---- | |
33 | static void load_window(char *, int lnum); | |
34 | static void warp_to_pc(int); | |
35 | #ifdef FEAT_BEVAL | |
36 | ! void workshop_beval_cb(BalloonEval *, int); | |
37 | ! static int computeIndex(int, char_u *, int); | |
38 | #endif | |
39 | static char *fixAccelText(char *); | |
40 | static void addMenu(char *, char *, char *); | |
41 | static char *lookupVerb(char *, int); | |
42 | static void coloncmd(char *, Boolean); | |
43 | ||
44 | extern Widget vimShell; | |
45 | *************** | |
46 | *** 1624,1631 **** | |
47 | } | |
48 | } | |
49 | } | |
50 | - #endif | |
51 | - | |
52 | ||
53 | static int | |
54 | computeIndex( | |
55 | --- 1624,1629 ---- | |
56 | *************** | |
57 | *** 1649,1654 **** | |
58 | --- 1647,1653 ---- | |
59 | ||
60 | return -1; | |
61 | } | |
62 | + #endif | |
63 | ||
64 | static void | |
65 | addMenu( | |
66 | *** ../vim-7.2.326/src/integration.c 2008-06-24 22:27:10.000000000 +0200 | |
67 | --- src/integration.c 2010-01-06 18:18:11.000000000 +0100 | |
68 | *************** | |
69 | *** 78,84 **** | |
70 | ||
71 | /* Functions private to this file */ | |
72 | static void workshop_connection_closed(void); | |
73 | ! static void messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2); | |
74 | static void workshop_disconnect(void); | |
75 | static void workshop_sensitivity(int num, char *table); | |
76 | static void adjust_sign_name(char *filename); | |
77 | --- 78,84 ---- | |
78 | ||
79 | /* Functions private to this file */ | |
80 | static void workshop_connection_closed(void); | |
81 | ! static void messageFromEserve(XtPointer clientData, int *dum1, XtInputId *dum2); | |
82 | static void workshop_disconnect(void); | |
83 | static void workshop_sensitivity(int num, char *table); | |
84 | static void adjust_sign_name(char *filename); | |
85 | *************** | |
86 | *** 157,165 **** | |
87 | ||
88 | } | |
89 | ||
90 | - /*ARGSUSED*/ | |
91 | void | |
92 | ! messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2) | |
93 | { | |
94 | char *cmd; /* the 1st word of the command */ | |
95 | ||
96 | --- 157,166 ---- | |
97 | ||
98 | } | |
99 | ||
100 | void | |
101 | ! messageFromEserve(XtPointer clientData UNUSED, | |
102 | ! int *dum1 UNUSED, | |
103 | ! XtInputId *dum2 UNUSED) | |
104 | { | |
105 | char *cmd; /* the 1st word of the command */ | |
106 | ||
107 | *************** | |
108 | *** 199,205 **** | |
109 | if (sign) { | |
110 | sign++; | |
111 | } | |
112 | ! /* Change sign name to accomodate a different size? */ | |
113 | adjust_sign_name(sign); | |
114 | workshop_add_mark_type(idx, color, sign); | |
115 | } | |
116 | --- 200,206 ---- | |
117 | if (sign) { | |
118 | sign++; | |
119 | } | |
120 | ! /* Change sign name to accommodate a different size? */ | |
121 | adjust_sign_name(sign); | |
122 | workshop_add_mark_type(idx, color, sign); | |
123 | } | |
124 | *************** | |
125 | *** 580,586 **** | |
126 | #endif | |
127 | ||
128 | ||
129 | ! /* Change sign name to accomodate a different size: | |
130 | * Create the filename based on the height. The filename format | |
131 | * of multisize icons are: | |
132 | * x.xpm : largest icon | |
133 | --- 581,587 ---- | |
134 | #endif | |
135 | ||
136 | ||
137 | ! /* Change sign name to accommodate a different size: | |
138 | * Create the filename based on the height. The filename format | |
139 | * of multisize icons are: | |
140 | * x.xpm : largest icon | |
141 | *************** | |
142 | *** 614,619 **** | |
143 | --- 615,621 ---- | |
144 | strcpy(s, ".xpm"); | |
145 | } | |
146 | ||
147 | + #if 0 | |
148 | /* Were we invoked by WorkShop? This function can be used early during startup | |
149 | if you want to do things differently if the editor is started standalone | |
150 | or in WorkShop mode. For example, in standalone mode you may not want to | |
151 | *************** | |
152 | *** 627,632 **** | |
153 | --- 629,635 ---- | |
154 | } | |
155 | return result; | |
156 | } | |
157 | + #endif | |
158 | ||
159 | /* Connect back to eserve */ | |
160 | void workshop_connect(XtAppContext context) | |
161 | *************** | |
162 | *** 750,755 **** | |
163 | --- 753,759 ---- | |
164 | * Utility functions | |
165 | */ | |
166 | ||
167 | + #if 0 | |
168 | /* Set icon for the window */ | |
169 | void | |
170 | workshop_set_icon(Display *display, Widget shell, char **xpmdata, | |
171 | *************** | |
172 | *** 793,798 **** | |
173 | --- 797,803 ---- | |
174 | } | |
175 | XtFree((char *)xpmAttributes.colorsymbols); | |
176 | } | |
177 | + #endif | |
178 | ||
179 | /* Minimize and maximize shells. From libutil's shell.cc. */ | |
180 | ||
181 | *************** | |
182 | *** 927,933 **** | |
183 | return success; | |
184 | } | |
185 | ||
186 | ! | |
187 | Boolean workshop_get_rows_cols(int *rows, int *cols) | |
188 | { | |
189 | static int r = 0; | |
190 | --- 932,938 ---- | |
191 | return success; | |
192 | } | |
193 | ||
194 | ! #if 0 | |
195 | Boolean workshop_get_rows_cols(int *rows, int *cols) | |
196 | { | |
197 | static int r = 0; | |
198 | *************** | |
199 | *** 958,963 **** | |
200 | --- 963,969 ---- | |
201 | } | |
202 | return success; | |
203 | } | |
204 | + #endif | |
205 | ||
206 | /* | |
207 | * Toolbar code | |
208 | *************** | |
209 | *** 1043,1054 **** | |
210 | } | |
211 | ||
212 | ||
213 | ! | |
214 | /* | |
215 | * Send information to eserve on certain editor events | |
216 | * You must make sure these are called when necessary | |
217 | */ | |
218 | - | |
219 | void workshop_file_closed(char *filename) | |
220 | { | |
221 | char buffer[2*MAXPATHLEN]; | |
222 | --- 1049,1059 ---- | |
223 | } | |
224 | ||
225 | ||
226 | ! #if 0 | |
227 | /* | |
228 | * Send information to eserve on certain editor events | |
229 | * You must make sure these are called when necessary | |
230 | */ | |
231 | void workshop_file_closed(char *filename) | |
232 | { | |
233 | char buffer[2*MAXPATHLEN]; | |
234 | *************** | |
235 | *** 1056,1061 **** | |
236 | --- 1061,1067 ---- | |
237 | NOCATGETS("deletedFile %s\n"), filename); | |
238 | write(sd, buffer, strlen(buffer)); | |
239 | } | |
240 | + #endif | |
241 | ||
242 | void workshop_file_closed_lineno(char *filename, int lineno) | |
243 | { | |
244 | *************** | |
245 | *** 1086,1106 **** | |
246 | workshop_moved_marks(filename); | |
247 | } | |
248 | ||
249 | ! void workshop_move_mark(char *filename, int markId, int newLineno) | |
250 | { | |
251 | char buffer[2*MAXPATHLEN]; | |
252 | vim_snprintf(buffer, sizeof(buffer), | |
253 | ! NOCATGETS("moveMark %s %d %d\n"), filename, markId, newLineno); | |
254 | write(sd, buffer, strlen(buffer)); | |
255 | } | |
256 | ||
257 | ! void workshop_file_modified(char *filename) | |
258 | { | |
259 | char buffer[2*MAXPATHLEN]; | |
260 | vim_snprintf(buffer, sizeof(buffer), | |
261 | ! NOCATGETS("modifiedFile %s\n"), filename); | |
262 | write(sd, buffer, strlen(buffer)); | |
263 | } | |
264 | ||
265 | void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h) | |
266 | { | |
267 | --- 1092,1114 ---- | |
268 | workshop_moved_marks(filename); | |
269 | } | |
270 | ||
271 | ! #if 0 | |
272 | ! void workshop_file_modified(char *filename) | |
273 | { | |
274 | char buffer[2*MAXPATHLEN]; | |
275 | vim_snprintf(buffer, sizeof(buffer), | |
276 | ! NOCATGETS("modifiedFile %s\n"), filename); | |
277 | write(sd, buffer, strlen(buffer)); | |
278 | } | |
279 | ||
280 | ! void workshop_move_mark(char *filename, int markId, int newLineno) | |
281 | { | |
282 | char buffer[2*MAXPATHLEN]; | |
283 | vim_snprintf(buffer, sizeof(buffer), | |
284 | ! NOCATGETS("moveMark %s %d %d\n"), filename, markId, newLineno); | |
285 | write(sd, buffer, strlen(buffer)); | |
286 | } | |
287 | + #endif | |
288 | ||
289 | void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h) | |
290 | { | |
291 | *************** | |
292 | *** 1179,1188 **** | |
293 | --- 1187,1198 ---- | |
294 | } | |
295 | ||
296 | /* Send a message to eserve */ | |
297 | + #if defined(NOHANDS_SUPPORT_FUNCTIONS) || defined(FEAT_BEVAL) | |
298 | void workshop_send_message(char *buf) | |
299 | { | |
300 | write(sd, buf, strlen(buf)); | |
301 | } | |
302 | + #endif | |
303 | ||
304 | /* Some methods, like currentFile, cursorPos, etc. are missing here. | |
305 | * But it looks like these are used for NoHands testing only so we | |
306 | *** ../vim-7.2.326/src/version.c 2010-01-06 17:46:03.000000000 +0100 | |
307 | --- src/version.c 2010-01-06 18:20:41.000000000 +0100 | |
308 | *************** | |
309 | *** 683,684 **** | |
310 | --- 683,686 ---- | |
311 | { /* Add new patch number below this line */ | |
312 | + /**/ | |
313 | + 327, | |
314 | /**/ | |
315 | ||
316 | -- | |
317 | From "know your smileys": | |
318 | (:-# Said something he shouldn't have | |
319 | ||
320 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
321 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
322 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
323 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |