| blob | ed541cb86d8f0531d0f74d33a05eaba00808150c |
1 ---
3 source/Makefile.dependencies | 2
4 source/built-ins.h | 111 ++++++++++++++
5 source/macro.c | 334 ++-----------------------------------------
6 3 files changed, 131 insertions(+), 316 deletions(-)
8 diff --quilt /dev/null new/source/built-ins.h
9 --- /dev/null
10 +++ new/source/built-ins.h
11 @@ -0,0 +1,111 @@
12 +#if !defined(MS) || !defined(MV)
13 +#error define MS() and MV() before including this file
14 +#endif
15 +
16 +MS(length, length)
17 +MS(get_range, getRange)
18 +MS(t_print, tPrint)
19 +MS(dialog, dialog)
20 +MS(string_dialog, stringDialog)
21 +MS(replace_range, replaceRange)
22 +MS(replace_selection, replaceSelection)
23 +MS(set_cursor_pos, setCursorPos)
24 +MS(get_character, getCharacter)
25 +MS(min, min)
26 +MS(max, max)
27 +MS(search, search)
28 +MS(search_string, searchString)
29 +MS(substring, substring)
30 +MS(replace_substring, replaceSubstring)
31 +MS(read_file, readFile)
32 +MS(write_file, writeFile)
33 +MS(append_file, appendFile)
34 +MS(beep, beep)
35 +MS(get_selection, getSelection)
36 +MS(valid_number, validNumber)
37 +MS(replace_in_string, replaceInString)
38 +MS(select, select)
39 +MS(select_rectangle, selectRectangle)
40 +MS(focus_window, focusWindow)
41 +MS(shell_command, shellCmd)
42 +MS(string_to_clipboard, stringToClipboard)
43 +MS(clipboard_to_string, clipboardToString)
44 +MS(toupper, toupper)
45 +MS(tolower, tolower)
46 +MS(list_dialog, listDialog)
47 +MS(getenv, getenv)
48 +MS(string_compare, stringCompare)
49 +MS(split, split)
50 +MS(calltip, calltip)
51 +MS(kill_calltip, killCalltip)
52 +/* DISABLED for 5.4
53 +MS(set_backlight_string, setBacklightString)
54 +*/
55 +MS(rangeset_create, rangesetCreate)
56 +MS(rangeset_destroy, rangesetDestroy)
57 +MS(rangeset_add, rangesetAdd)
58 +MS(rangeset_subtract, rangesetSubtract)
59 +MS(rangeset_invert, rangesetInvert)
60 +MS(rangeset_info, rangesetInfo)
61 +MS(rangeset_range, rangesetRange)
62 +MS(rangeset_includes, rangesetIncludesPos)
63 +MS(rangeset_set_color, rangesetSetColor)
64 +MS(rangeset_set_name, rangesetSetName)
65 +MS(rangeset_set_mode, rangesetSetMode)
66 +MS(rangeset_get_by_name, rangesetGetByName)
67 +MS(get_pattern_by_name, getPatternByName)
68 +MS(get_pattern_at_pos, getPatternAtPos)
69 +MS(get_style_by_name, getStyleByName)
70 +MS(get_style_at_pos, getStyleAtPos)
71 +MS(filename_dialog, filenameDialog)
72 +
73 +MV(cursor, cursor)
74 +MV(line, line)
75 +MV(column, column)
76 +MV(file_name, fileName)
77 +MV(file_path, filePath)
78 +MV(text_length, length)
79 +MV(selection_start, selectionStart)
80 +MV(selection_end, selectionEnd)
81 +MV(selection_left, selectionLeft)
82 +MV(selection_right, selectionRight)
83 +MV(wrap_margin, wrapMargin)
84 +MV(tab_dist, tabDist)
85 +MV(em_tab_dist, emTabDist)
86 +MV(use_tabs, useTabs)
87 +MV(language_mode, languageMode)
88 +MV(modified, modified)
89 +MV(statistics_line, statisticsLine)
90 +MV(incremental_search_line, incSearchLine)
91 +MV(show_line_numbers, showLineNumbers)
92 +MV(auto_indent, autoIndent)
93 +MV(wrap_text, wrapText)
94 +MV(highlight_syntax, highlightSyntax)
95 +MV(make_backup_copy, makeBackupCopy)
96 +MV(incremental_backup, incBackup)
97 +MV(show_matching, showMatching)
98 +MV(match_syntax_based, matchSyntaxBased)
99 +MV(overtype_mode, overTypeMode)
100 +MV(read_only, readOnly)
101 +MV(locked, locked)
102 +MV(file_format, fileFormat)
103 +MV(font_name, fontName)
104 +MV(font_name_italic, fontNameItalic)
105 +MV(font_name_bold, fontNameBold)
106 +MV(font_name_bold_italic, fontNameBoldItalic)
107 +MV(sub_sep, subscriptSep)
108 +MV(min_font_width, minFontWidth)
109 +MV(max_font_width, maxFontWidth)
110 +MV(top_line, topLine)
111 +MV(n_display_lines, numDisplayLines)
112 +MV(display_width, displayWidth)
113 +MV(active_pane, activePane)
114 +MV(n_panes, nPanes)
115 +MV(empty_array, emptyArray)
116 +MV(server_name, serverName)
117 +MV(calltip_ID, calltipID)
118 +/* DISABLED for 5.4
119 +MV($backlight_string, backlightString)
120 +*/
121 +MV(rangeset_list, rangesetList)
122 +MV(VERSION, version)
123 diff --quilt old/source/macro.c new/source/macro.c
124 --- old/source/macro.c
125 +++ new/source/macro.c
126 @@ -166,76 +166,15 @@ static void bannerTimeoutProc(XtPointer
127 static Boolean continueWorkProc(XtPointer clientData);
128 static int escapeStringChars(char *fromString, char *toString);
129 static int escapedStringLength(char *string);
130 -static int lengthMS(WindowInfo *window, DataValue *argList, int nArgs,
131 - DataValue *result, char **errMsg);
132 -static int minMS(WindowInfo *window, DataValue *argList, int nArgs,
133 - DataValue *result, char **errMsg);
134 -static int maxMS(WindowInfo *window, DataValue *argList, int nArgs,
135 - DataValue *result, char **errMsg);
136 -static int focusWindowMS(WindowInfo *window, DataValue *argList, int nArgs,
137 - DataValue *result, char **errMsg);
138 -static int getRangeMS(WindowInfo *window, DataValue *argList, int nArgs,
139 - DataValue *result, char **errMsg);
140 -static int getCharacterMS(WindowInfo *window, DataValue *argList, int nArgs,
141 - DataValue *result, char **errMsg);
142 -static int replaceRangeMS(WindowInfo *window, DataValue *argList, int nArgs,
143 - DataValue *result, char **errMsg);
144 -static int replaceSelectionMS(WindowInfo *window, DataValue *argList, int nArgs,
145 - DataValue *result, char **errMsg);
146 -static int getSelectionMS(WindowInfo *window, DataValue *argList, int nArgs,
147 - DataValue *result, char **errMsg);
148 -static int validNumberMS(WindowInfo *window, DataValue *argList, int nArgs,
149 - DataValue *result, char **errMsg);
150 -static int replaceInStringMS(WindowInfo *window, DataValue *argList, int nArgs,
151 - DataValue *result, char **errMsg);
152 -static int replaceSubstringMS(WindowInfo *window, DataValue *argList, int nArgs,
153 - DataValue *result, char **errMsg);
154 -static int readFileMS(WindowInfo *window, DataValue *argList, int nArgs,
155 - DataValue *result, char **errMsg);
156 -static int writeFileMS(WindowInfo *window, DataValue *argList, int nArgs,
157 - DataValue *result, char **errMsg);
158 -static int appendFileMS(WindowInfo *window, DataValue *argList, int nArgs,
159 - DataValue *result, char **errMsg);
160 +
161 static int writeOrAppendFile(int append, WindowInfo *window,
162 DataValue *argList, int nArgs, DataValue *result, char **errMsg);
163 -static int substringMS(WindowInfo *window, DataValue *argList, int nArgs,
164 - DataValue *result, char **errMsg);
165 -static int toupperMS(WindowInfo *window, DataValue *argList, int nArgs,
166 - DataValue *result, char **errMsg);
167 -static int tolowerMS(WindowInfo *window, DataValue *argList, int nArgs,
168 - DataValue *result, char **errMsg);
169 -static int stringToClipboardMS(WindowInfo *window, DataValue *argList, int nArgs,
170 - DataValue *result, char **errMsg);
171 -static int clipboardToStringMS(WindowInfo *window, DataValue *argList, int nArgs,
172 - DataValue *result, char **errMsg);
173 -static int searchMS(WindowInfo *window, DataValue *argList, int nArgs,
174 - DataValue *result, char **errMsg);
175 -static int searchStringMS(WindowInfo *window, DataValue *argList, int nArgs,
176 - DataValue *result, char **errMsg);
177 -static int setCursorPosMS(WindowInfo *window, DataValue *argList, int nArgs,
178 - DataValue *result, char **errMsg);
179 -static int beepMS(WindowInfo *window, DataValue *argList, int nArgs,
180 - DataValue *result, char **errMsg);
181 -static int selectMS(WindowInfo *window, DataValue *argList, int nArgs,
182 - DataValue *result, char **errMsg);
183 -static int selectRectangleMS(WindowInfo *window, DataValue *argList, int nArgs,
184 - DataValue *result, char **errMsg);
185 -static int tPrintMS(WindowInfo *window, DataValue *argList, int nArgs,
186 - DataValue *result, char **errMsg);
187 -static int getenvMS(WindowInfo *window, DataValue *argList, int nArgs,
188 - DataValue *result, char **errMsg);
189 -static int shellCmdMS(WindowInfo *window, DataValue *argList, int nArgs,
190 - DataValue *result, char **errMsg);
191 -static int dialogMS(WindowInfo *window, DataValue *argList, int nArgs,
192 - DataValue *result, char **errMsg);
193 static void dialogBtnCB(Widget w, XtPointer clientData, XtPointer callData);
194 static void dialogCloseCB(Widget w, XtPointer clientData, XtPointer callData);
195 #ifdef LESSTIF_VERSION
196 static void dialogEscCB(Widget w, XtPointer clientData, XEvent *event,
197 Boolean *cont);
198 #endif /* LESSTIF_VERSION */
199 -static int stringDialogMS(WindowInfo *window, DataValue *argList, int nArgs,
200 - DataValue *result, char **errMsg);
201 static void stringDialogBtnCB(Widget w, XtPointer clientData,
202 XtPointer callData);
203 static void stringDialogCloseCB(Widget w, XtPointer clientData,
204 @@ -244,13 +183,6 @@ static void stringDialogCloseCB(Widget w
205 static void stringDialogEscCB(Widget w, XtPointer clientData, XEvent *event,
206 Boolean *cont);
207 #endif /* LESSTIF_VERSION */
208 -static int calltipMS(WindowInfo *window, DataValue *argList, int nArgs,
209 - DataValue *result, char **errMsg);
210 -static int killCalltipMS(WindowInfo *window, DataValue *argList, int nArgs,
211 - DataValue *result, char **errMsg);
212 -/* T Balinski */
213 -static int listDialogMS(WindowInfo *window, DataValue *argList, int nArgs,
214 - DataValue *result, char **errMsg);
215 static void listDialogBtnCB(Widget w, XtPointer clientData,
216 XtPointer callData);
217 static void listDialogCloseCB(Widget w, XtPointer clientData,
218 @@ -260,104 +192,6 @@ static void listDialogCloseCB(Widget w,
219 static void listDialogEscCB(Widget w, XtPointer clientData, XEvent *event,
220 Boolean *cont);
221 #endif /* LESSTIF_VERSION */
222 -static int stringCompareMS(WindowInfo *window, DataValue *argList, int nArgs,
223 - DataValue *result, char **errMsg);
224 -static int splitMS(WindowInfo *window, DataValue *argList, int nArgs,
225 - DataValue *result, char **errMsg);
226 -/* DISASBLED for 5.4
227 -static int setBacklightStringMS(WindowInfo *window, DataValue *argList,
228 - int nArgs, DataValue *result, char **errMsg);
229 -*/
230 -static int cursorMV(WindowInfo *window, DataValue *argList, int nArgs,
231 - DataValue *result, char **errMsg);
232 -static int lineMV(WindowInfo *window, DataValue *argList, int nArgs,
233 - DataValue *result, char **errMsg);
234 -static int columnMV(WindowInfo *window, DataValue *argList, int nArgs,
235 - DataValue *result, char **errMsg);
236 -static int fileNameMV(WindowInfo *window, DataValue *argList, int nArgs,
237 - DataValue *result, char **errMsg);
238 -static int filePathMV(WindowInfo *window, DataValue *argList, int nArgs,
239 - DataValue *result, char **errMsg);
240 -static int lengthMV(WindowInfo *window, DataValue *argList, int nArgs,
241 - DataValue *result, char **errMsg);
242 -static int selectionStartMV(WindowInfo *window, DataValue *argList, int nArgs,
243 - DataValue *result, char **errMsg);
244 -static int selectionEndMV(WindowInfo *window, DataValue *argList, int nArgs,
245 - DataValue *result, char **errMsg);
246 -static int selectionLeftMV(WindowInfo *window, DataValue *argList, int nArgs,
247 - DataValue *result, char **errMsg);
248 -static int selectionRightMV(WindowInfo *window, DataValue *argList, int nArgs,
249 - DataValue *result, char **errMsg);
250 -static int statisticsLineMV(WindowInfo *window, DataValue *argList, int nArgs,
251 - DataValue *result, char **errMsg);
252 -static int incSearchLineMV(WindowInfo *window, DataValue *argList, int nArgs,
253 - DataValue *result, char **errMsg);
254 -static int showLineNumbersMV(WindowInfo *window, DataValue *argList, int nArgs,
255 - DataValue *result, char **errMsg);
256 -static int autoIndentMV(WindowInfo *window, DataValue *argList, int nArgs,
257 - DataValue *result, char **errMsg);
258 -static int wrapTextMV(WindowInfo *window, DataValue *argList, int nArgs,
259 - DataValue *result, char **errMsg);
260 -static int highlightSyntaxMV(WindowInfo *window, DataValue *argList, int nArgs,
261 - DataValue *result, char **errMsg);
262 -static int makeBackupCopyMV(WindowInfo *window, DataValue *argList, int nArgs,
263 - DataValue *result, char **errMsg);
264 -static int incBackupMV(WindowInfo *window, DataValue *argList, int nArgs,
265 - DataValue *result, char **errMsg);
266 -static int showMatchingMV(WindowInfo *window, DataValue *argList, int nArgs,
267 - DataValue *result, char **errMsg);
268 -static int matchSyntaxBasedMV(WindowInfo *window, DataValue *argList, int nArgs,
269 - DataValue *result, char **errMsg);
270 -static int overTypeModeMV(WindowInfo *window, DataValue *argList, int nArgs,
271 - DataValue *result, char **errMsg);
272 -static int readOnlyMV(WindowInfo *window, DataValue *argList, int nArgs,
273 - DataValue *result, char **errMsg);
274 -static int lockedMV(WindowInfo *window, DataValue *argList, int nArgs,
275 - DataValue *result, char **errMsg);
276 -static int fileFormatMV(WindowInfo *window, DataValue *argList, int nArgs,
277 - DataValue *result, char **errMsg);
278 -static int fontNameMV(WindowInfo *window, DataValue *argList, int nArgs,
279 - DataValue *result, char **errMsg);
280 -static int fontNameItalicMV(WindowInfo *window, DataValue *argList, int nArgs,
281 - DataValue *result, char **errMsg);
282 -static int fontNameBoldMV(WindowInfo *window, DataValue *argList, int nArgs,
283 - DataValue *result, char **errMsg);
284 -static int fontNameBoldItalicMV(WindowInfo *window, DataValue *argList, int nArgs,
285 - DataValue *result, char **errMsg);
286 -static int subscriptSepMV(WindowInfo *window, DataValue *argList, int nArgs,
287 - DataValue *result, char **errMsg);
288 -static int minFontWidthMV(WindowInfo *window, DataValue *argList, int nArgs,
289 - DataValue *result, char **errMsg);
290 -static int maxFontWidthMV(WindowInfo *window, DataValue *argList, int nArgs,
291 - DataValue *result, char **errMsg);
292 -static int wrapMarginMV(WindowInfo *window, DataValue *argList, int nArgs,
293 - DataValue *result, char **errMsg);
294 -static int topLineMV(WindowInfo *window, DataValue *argList, int nArgs,
295 - DataValue *result, char **errMsg);
296 -static int numDisplayLinesMV(WindowInfo *window, DataValue *argList, int nArgs,
297 - DataValue *result, char **errMsg);
298 -static int displayWidthMV(WindowInfo *window, DataValue *argList, int nArgs,
299 - DataValue *result, char **errMsg);
300 -static int activePaneMV(WindowInfo *window, DataValue *argList, int nArgs,
301 - DataValue *result, char **errMsg);
302 -static int nPanesMV(WindowInfo *window, DataValue *argList, int nArgs,
303 - DataValue *result, char **errMsg);
304 -static int emptyArrayMV(WindowInfo *window, DataValue *argList, int nArgs,
305 - DataValue *result, char **errMsg);
306 -static int serverNameMV(WindowInfo *window, DataValue *argList, int nArgs,
307 - DataValue *result, char **errMsg);
308 -static int tabDistMV(WindowInfo *window, DataValue *argList, int nArgs,
309 - DataValue *result, char **errMsg);
310 -static int emTabDistMV(WindowInfo *window, DataValue *argList, int nArgs,
311 - DataValue *result, char **errMsg);
312 -static int useTabsMV(WindowInfo *window, DataValue *argList, int nArgs,
313 - DataValue *result, char **errMsg);
314 -static int modifiedMV(WindowInfo *window, DataValue *argList, int nArgs,
315 - DataValue *result, char **errMsg);
316 -static int languageModeMV(WindowInfo *window, DataValue *argList, int nArgs,
317 - DataValue *result, char **errMsg);
318 -static int calltipIDMV(WindowInfo *window, DataValue *argList, int nArgs,
319 - DataValue *result, char **errMsg);
320 static int readSearchArgs(DataValue *argList, int nArgs, int*searchDirection,
321 int *searchType, int *wrap, char **errMsg);
322 static int wrongNArgsErr(char **errMsg);
323 @@ -366,169 +200,39 @@ static int strCaseCmp(char *str1, char *
324 static int readIntArg(DataValue dv, int *result, char **errMsg);
325 static int readStringArg(DataValue dv, char **result, char *stringStorage,
326 char **errMsg);
327 -/* DISABLED FOR 5.4
328 -static int backlightStringMV(WindowInfo *window, DataValue *argList,
329 - int nArgs, DataValue *result, char **errMsg);
330 -*/
331 -static int rangesetListMV(WindowInfo *window, DataValue *argList,
332 - int nArgs, DataValue *result, char **errMsg);
333 -static int versionMV(WindowInfo* window, DataValue* argList, int nArgs,
334 - DataValue* result, char** errMsg);
335 -static int rangesetCreateMS(WindowInfo *window, DataValue *argList, int nArgs,
336 - DataValue *result, char **errMsg);
337 -static int rangesetDestroyMS(WindowInfo *window, DataValue *argList, int nArgs,
338 - DataValue *result, char **errMsg);
339 -static int rangesetGetByNameMS(WindowInfo *window, DataValue *argList, int nArgs,
340 - DataValue *result, char **errMsg);
341 -static int rangesetAddMS(WindowInfo *window, DataValue *argList, int nArgs,
342 - DataValue *result, char **errMsg);
343 -static int rangesetSubtractMS(WindowInfo *window, DataValue *argList, int nArgs,
344 - DataValue *result, char **errMsg);
345 -static int rangesetInvertMS(WindowInfo *window, DataValue *argList, int nArgs,
346 - DataValue *result, char **errMsg);
347 -static int rangesetInfoMS(WindowInfo *window, DataValue *argList, int nArgs,
348 - DataValue *result, char **errMsg);
349 -static int rangesetRangeMS(WindowInfo *window, DataValue *argList, int nArgs,
350 - DataValue *result, char **errMsg);
351 -static int rangesetIncludesPosMS(WindowInfo *window, DataValue *argList,
352 - int nArgs, DataValue *result, char **errMsg);
353 -static int rangesetSetColorMS(WindowInfo *window, DataValue *argList,
354 - int nArgs, DataValue *result, char **errMsg);
355 -static int rangesetSetNameMS(WindowInfo *window, DataValue *argList,
356 - int nArgs, DataValue *result, char **errMsg);
357 -static int rangesetSetModeMS(WindowInfo *window, DataValue *argList,
358 - int nArgs, DataValue *result, char **errMsg);
360 static int fillPatternResult(DataValue *result, char **errMsg, WindowInfo *window,
361 char *patternName, Boolean preallocatedPatternName, Boolean includeName,
362 char *styleName, int bufferPos);
363 -static int getPatternByNameMS(WindowInfo *window, DataValue *argList, int nArgs,
364 - DataValue *result, char **errMsg);
365 -static int getPatternAtPosMS(WindowInfo *window, DataValue *argList, int nArgs,
366 - DataValue *result, char **errMsg);
368 static int fillStyleResult(DataValue *result, char **errMsg,
369 WindowInfo *window, char *styleName, Boolean preallocatedStyleName,
370 Boolean includeName, int patCode, int bufferPos);
371 -static int getStyleByNameMS(WindowInfo *window, DataValue *argList, int nArgs,
372 - DataValue *result, char **errMsg);
373 -static int getStyleAtPosMS(WindowInfo *window, DataValue *argList, int nArgs,
374 - DataValue *result, char **errMsg);
375 -static int filenameDialogMS(WindowInfo* window, DataValue* argList, int nArgs,
376 - DataValue* result, char** errMsg);
377 +
378 +#define MS(name, fn) static int fn##MS(WindowInfo *, DataValue *, int, \
379 + DataValue *, char **);
380 +#define MV(name, fn) static int fn##MV(WindowInfo *, DataValue *, int, \
381 + DataValue *, char **);
382 +#include "built-ins.h"
383 +#undef MS
384 +#undef MV
386 /* Built-in subroutines and variables for the macro language */
387 static const BuiltInSubrName MacroSubrs[] = {
388 - { "length", lengthMS },
389 - { "get_range", getRangeMS },
390 - { "t_print", tPrintMS },
391 - { "dialog", dialogMS },
392 - { "string_dialog", stringDialogMS },
393 - { "replace_range", replaceRangeMS },
394 - { "replace_selection", replaceSelectionMS },
395 - { "set_cursor_pos", setCursorPosMS },
396 - { "get_character", getCharacterMS },
397 - { "min", minMS },
398 - { "max", maxMS },
399 - { "search", searchMS },
400 - { "search_string", searchStringMS },
401 - { "substring", substringMS },
402 - { "replace_substring", replaceSubstringMS },
403 - { "read_file", readFileMS },
404 - { "write_file", writeFileMS },
405 - { "append_file", appendFileMS },
406 - { "beep", beepMS },
407 - { "get_selection", getSelectionMS },
408 - { "valid_number", validNumberMS },
409 - { "replace_in_string", replaceInStringMS },
410 - { "select", selectMS },
411 - { "select_rectangle", selectRectangleMS },
412 - { "focus_window", focusWindowMS },
413 - { "shell_command", shellCmdMS },
414 - { "string_to_clipboard", stringToClipboardMS },
415 - { "clipboard_to_string", clipboardToStringMS },
416 - { "toupper", toupperMS },
417 - { "tolower", tolowerMS },
418 - { "list_dialog", listDialogMS },
419 - { "getenv", getenvMS },
420 - { "string_compare", stringCompareMS },
421 - { "split", splitMS },
422 - { "calltip", calltipMS },
423 - { "kill_calltip", killCalltipMS },
424 -/* DISABLED for 5.4
425 - { "set_backlight_string", setBacklightStringMS },
426 -*/
427 - { "rangeset_create", rangesetCreateMS },
428 - { "rangeset_destroy", rangesetDestroyMS },
429 - { "rangeset_add", rangesetAddMS },
430 - { "rangeset_subtract", rangesetSubtractMS },
431 - { "rangeset_invert", rangesetInvertMS },
432 - { "rangeset_info", rangesetInfoMS },
433 - { "rangeset_range", rangesetRangeMS },
434 - { "rangeset_includes", rangesetIncludesPosMS },
435 - { "rangeset_set_color", rangesetSetColorMS },
436 - { "rangeset_set_name", rangesetSetNameMS },
437 - { "rangeset_set_mode", rangesetSetModeMS },
438 - { "rangeset_get_by_name", rangesetGetByNameMS },
439 - { "get_pattern_by_name", getPatternByNameMS },
440 - { "get_pattern_at_pos", getPatternAtPosMS },
441 - { "get_style_by_name", getStyleByNameMS },
442 - { "get_style_at_pos", getStyleAtPosMS },
443 - { "filename_dialog", filenameDialogMS },
444 +#define MS(name, fn) { #name, fn##MS },
445 +#define MV(name, fn)
446 +#include "built-ins.h"
447 +#undef MS
448 +#undef MV
449 { NULL, NULL } /* sentinel */
450 };
452 static const BuiltInSubrName SpecialVars[] = {
453 - { "$cursor", cursorMV },
454 - { "$line", lineMV },
455 - { "$column", columnMV },
456 - { "$file_name", fileNameMV },
457 - { "$file_path", filePathMV },
458 - { "$text_length", lengthMV },
459 - { "$selection_start", selectionStartMV },
460 - { "$selection_end", selectionEndMV },
461 - { "$selection_left", selectionLeftMV },
462 - { "$selection_right", selectionRightMV },
463 - { "$wrap_margin", wrapMarginMV },
464 - { "$tab_dist", tabDistMV },
465 - { "$em_tab_dist", emTabDistMV },
466 - { "$use_tabs", useTabsMV },
467 - { "$language_mode", languageModeMV },
468 - { "$modified", modifiedMV },
469 - { "$statistics_line", statisticsLineMV },
470 - { "$incremental_search_line", incSearchLineMV },
471 - { "$show_line_numbers", showLineNumbersMV },
472 - { "$auto_indent", autoIndentMV },
473 - { "$wrap_text", wrapTextMV },
474 - { "$highlight_syntax", highlightSyntaxMV },
475 - { "$make_backup_copy", makeBackupCopyMV },
476 - { "$incremental_backup", incBackupMV },
477 - { "$show_matching", showMatchingMV },
478 - { "$match_syntax_based", matchSyntaxBasedMV },
479 - { "$overtype_mode", overTypeModeMV },
480 - { "$read_only", readOnlyMV },
481 - { "$locked", lockedMV },
482 - { "$file_format", fileFormatMV },
483 - { "$font_name", fontNameMV },
484 - { "$font_name_italic", fontNameItalicMV },
485 - { "$font_name_bold", fontNameBoldMV },
486 - { "$font_name_bold_italic", fontNameBoldItalicMV },
487 - { "$sub_sep", subscriptSepMV },
488 - { "$min_font_width", minFontWidthMV },
489 - { "$max_font_width", maxFontWidthMV },
490 - { "$top_line", topLineMV },
491 - { "$n_display_lines", numDisplayLinesMV },
492 - { "$display_width", displayWidthMV },
493 - { "$active_pane", activePaneMV },
494 - { "$n_panes", nPanesMV },
495 - { "$empty_array", emptyArrayMV },
496 - { "$server_name", serverNameMV },
497 - { "$calltip_ID", calltipIDMV },
498 -/* DISABLED for 5.4
499 - { "$backlight_string", backlightStringMV },
500 -*/
501 - { "$rangeset_list", rangesetListMV },
502 - { "$VERSION", versionMV },
503 +#define MS(name, fn)
504 +#define MV(name, fn) { "$" #name, fn##MV },
505 +#include "built-ins.h"
506 +#undef MS
507 +#undef MV
508 { NULL, NULL } /* sentinel */
509 };
511 diff --quilt old/source/Makefile.dependencies new/source/Makefile.dependencies
512 --- old/source/Makefile.dependencies
513 +++ new/source/Makefile.dependencies
514 @@ -21,7 +21,7 @@ macro.o: macro.c macro.h nedit.h textBuf
515 interpret.h ops.h rbTree.h parse.h search.h server.h shell.h smartIndent.h \
516 userCmds.h selection.h tags.h calltips.h textDisp.h ../util/DialogF.h \
517 ../util/misc.h ../util/fileUtils.h ../util/utils.h highlight.h \
518 - highlightData.h rangeset.h
519 + highlightData.h rangeset.h built-ins.h
520 menu.o: menu.c menu.h nedit.h textBuf.h text.h file.h window.h search.h \
521 selection.h undo.h shift.h help.h help_topic.h preferences.h tags.h \
522 userCmds.h shell.h macro.h highlight.h highlightData.h interpret.h ops.h \