summaryrefslogtreecommitdiff
path: root/source/ap/vim/patches/7.2.327
blob: 4bfb077c879400f323e870f24cc6b0bbc501ed5d (plain)
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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
To: vim-dev@vim.org
Subject: Patch 7.2.327
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.327
Problem:    Unused functions in Workshop.
Solution:   Add "#if 0" and minor cleanup. (Dominique Pelle)
Files:	    src/workshop.c, src/integration.c, src/ingegration.h


*** ../vim-7.2.326/src/workshop.c	2009-05-21 23:25:38.000000000 +0200
--- src/workshop.c	2010-01-06 18:10:10.000000000 +0100
***************
*** 56,67 ****
  static void	 load_window(char *, int lnum);
  static void	 warp_to_pc(int);
  #ifdef FEAT_BEVAL
! void		workshop_beval_cb(BalloonEval *, int);
  #endif
  static char	*fixAccelText(char *);
  static void	 addMenu(char *, char *, char *);
  static char	*lookupVerb(char *, int);
- static int	 computeIndex(int, char_u *, int);
  static void	 coloncmd(char *, Boolean);
  
  extern Widget	 vimShell;
--- 56,67 ----
  static void	 load_window(char *, int lnum);
  static void	 warp_to_pc(int);
  #ifdef FEAT_BEVAL
! void		 workshop_beval_cb(BalloonEval *, int);
! static int	 computeIndex(int, char_u *, int);
  #endif
  static char	*fixAccelText(char *);
  static void	 addMenu(char *, char *, char *);
  static char	*lookupVerb(char *, int);
  static void	 coloncmd(char *, Boolean);
  
  extern Widget	 vimShell;
***************
*** 1624,1631 ****
  	}
      }
  }
- #endif
- 
  
      static int
  computeIndex(
--- 1624,1629 ----
***************
*** 1649,1654 ****
--- 1647,1653 ----
  
      return -1;
  }
+ #endif
  
      static void
  addMenu(
*** ../vim-7.2.326/src/integration.c	2008-06-24 22:27:10.000000000 +0200
--- src/integration.c	2010-01-06 18:18:11.000000000 +0100
***************
*** 78,84 ****
  
  /* Functions private to this file */
  static void workshop_connection_closed(void);
! static void messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2);
  static void workshop_disconnect(void);
  static void workshop_sensitivity(int num, char *table);
  static void adjust_sign_name(char *filename);
--- 78,84 ----
  
  /* Functions private to this file */
  static void workshop_connection_closed(void);
! static void messageFromEserve(XtPointer clientData, int *dum1, XtInputId *dum2);
  static void workshop_disconnect(void);
  static void workshop_sensitivity(int num, char *table);
  static void adjust_sign_name(char *filename);
***************
*** 157,165 ****
  
  }
  
- /*ARGSUSED*/
  void
! messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2)
  {
  	char	*cmd;		/* the 1st word of the command */
  
--- 157,166 ----
  
  }
  
  void
! messageFromEserve(XtPointer clientData UNUSED,
! 		  int *dum1 UNUSED,
! 		  XtInputId *dum2 UNUSED)
  {
  	char	*cmd;		/* the 1st word of the command */
  
***************
*** 199,205 ****
  			if (sign) {
  				sign++;
  			}
! 			/* Change sign name to accomodate a different size? */
  			adjust_sign_name(sign);
  			workshop_add_mark_type(idx, color, sign);
  		}
--- 200,206 ----
  			if (sign) {
  				sign++;
  			}
! 			/* Change sign name to accommodate a different size? */
  			adjust_sign_name(sign);
  			workshop_add_mark_type(idx, color, sign);
  		}
***************
*** 580,586 ****
  #endif
  
  
! /* Change sign name to accomodate a different size:
   * Create the filename based on the height. The filename format
   * of multisize icons are:
   *    x.xpm   : largest icon
--- 581,587 ----
  #endif
  
  
! /* Change sign name to accommodate a different size:
   * Create the filename based on the height. The filename format
   * of multisize icons are:
   *    x.xpm   : largest icon
***************
*** 614,619 ****
--- 615,621 ----
  		strcpy(s, ".xpm");
  }
  
+ #if 0
  /* Were we invoked by WorkShop? This function can be used early during startup
     if you want to do things differently if the editor is started standalone
     or in WorkShop mode. For example, in standalone mode you may not want to
***************
*** 627,632 ****
--- 629,635 ----
  	}
  	return result;
  }
+ #endif
  
  /* Connect back to eserve */
  void	workshop_connect(XtAppContext context)
***************
*** 750,755 ****
--- 753,759 ----
   * Utility functions
   */
  
+ #if 0
  /* Set icon for the window */
  void
  workshop_set_icon(Display *display, Widget shell, char **xpmdata,
***************
*** 793,798 ****
--- 797,803 ----
  	}
  	XtFree((char *)xpmAttributes.colorsymbols);
  }
+ #endif
  
  /* Minimize and maximize shells. From libutil's shell.cc. */
  
***************
*** 927,933 ****
  	return success;
  }
  
! 
  Boolean workshop_get_rows_cols(int *rows, int *cols)
  {
  	static int	r = 0;
--- 932,938 ----
  	return success;
  }
  
! #if 0
  Boolean workshop_get_rows_cols(int *rows, int *cols)
  {
  	static int	r = 0;
***************
*** 958,963 ****
--- 963,969 ----
  	}
  	return success;
  }
+ #endif
  
  /*
   * Toolbar code
***************
*** 1043,1054 ****
  }
  
  
! 
  /*
   * Send information to eserve on certain editor events
   * You must make sure these are called when necessary
   */
- 
  void workshop_file_closed(char *filename)
  {
  	char buffer[2*MAXPATHLEN];
--- 1049,1059 ----
  }
  
  
! #if 0
  /*
   * Send information to eserve on certain editor events
   * You must make sure these are called when necessary
   */
  void workshop_file_closed(char *filename)
  {
  	char buffer[2*MAXPATHLEN];
***************
*** 1056,1061 ****
--- 1061,1067 ----
  			NOCATGETS("deletedFile %s\n"), filename);
  	write(sd, buffer, strlen(buffer));
  }
+ #endif
  
  void workshop_file_closed_lineno(char *filename, int lineno)
  {
***************
*** 1086,1106 ****
  	workshop_moved_marks(filename);
  }
  
! void workshop_move_mark(char *filename, int markId, int newLineno)
  {
  	char buffer[2*MAXPATHLEN];
  	vim_snprintf(buffer, sizeof(buffer),
! 			NOCATGETS("moveMark %s %d %d\n"), filename, markId, newLineno);
  	write(sd, buffer, strlen(buffer));
  }
  
! void workshop_file_modified(char *filename)
  {
  	char buffer[2*MAXPATHLEN];
  	vim_snprintf(buffer, sizeof(buffer),
! 			NOCATGETS("modifiedFile %s\n"), filename);
  	write(sd, buffer, strlen(buffer));
  }
  
  void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h)
  {
--- 1092,1114 ----
  	workshop_moved_marks(filename);
  }
  
! #if 0
! void workshop_file_modified(char *filename)
  {
  	char buffer[2*MAXPATHLEN];
  	vim_snprintf(buffer, sizeof(buffer),
! 			NOCATGETS("modifiedFile %s\n"), filename);
  	write(sd, buffer, strlen(buffer));
  }
  
! void workshop_move_mark(char *filename, int markId, int newLineno)
  {
  	char buffer[2*MAXPATHLEN];
  	vim_snprintf(buffer, sizeof(buffer),
! 	       NOCATGETS("moveMark %s %d %d\n"), filename, markId, newLineno);
  	write(sd, buffer, strlen(buffer));
  }
+ #endif
  
  void workshop_frame_moved(int new_x, int new_y, int new_w, int new_h)
  {
***************
*** 1179,1188 ****
--- 1187,1198 ----
  }
  
  /* Send a message to eserve */
+ #if defined(NOHANDS_SUPPORT_FUNCTIONS) || defined(FEAT_BEVAL)
  void workshop_send_message(char *buf)
  {
  	write(sd, buf, strlen(buf));
  }
+ #endif
  
  /* Some methods, like currentFile, cursorPos, etc. are missing here.
   * But it looks like these are used for NoHands testing only so we
*** ../vim-7.2.326/src/version.c	2010-01-06 17:46:03.000000000 +0100
--- src/version.c	2010-01-06 18:20:41.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     327,
  /**/

-- 
From "know your smileys":
 (:-#	Said something he shouldn't have

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///