1 A patch to Scintilla 3.54 containing our changes to Scintilla
2 (removing unused lexers, exporting symbols, and an updated marshallers file).
3 diff --git scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx
4 index 0871ca2..49dc278 100644
5 --- scintilla/gtk/ScintillaGTK.cxx
6 +++ scintilla/gtk/ScintillaGTK.cxx
7 @@ -3046,11 +3046,13 @@ sptr_t ScintillaGTK::DirectFunction(
10 /* legacy name for scintilla_object_send_message */
12 sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
13 ScintillaGTK *psci = static_cast<ScintillaGTK *>(sci->pscin);
14 return psci->WndProc(iMessage, wParam, lParam);
18 gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
19 return scintilla_send_message(sci, iMessage, wParam, lParam);
21 @@ -3062,6 +3064,7 @@ extern void Platform_Initialise();
22 extern void Platform_Finalise();
24 /* legacy name for scintilla_object_get_type */
26 GType scintilla_get_type() {
27 static GType scintilla_type = 0;
29 @@ -3091,6 +3094,7 @@ GType scintilla_get_type() {
30 return scintilla_type;
34 GType scintilla_object_get_type() {
35 return scintilla_get_type();
37 @@ -3200,6 +3204,7 @@ static void scintilla_init(ScintillaObje
40 /* legacy name for scintilla_object_new */
42 GtkWidget* scintilla_new() {
43 GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
44 gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
45 @@ -3207,6 +3212,7 @@ GtkWidget* scintilla_new() {
50 GtkWidget *scintilla_object_new() {
51 return scintilla_new();
53 @@ -3250,6 +3250,7 @@ void scintilla_release_resources(void) {
54 static void *copy_(void *src) { return src; }
55 static void free_(void *) { }
58 GType scnotification_get_type(void) {
59 static gsize type_id = 0;
60 if (g_once_init_enter(&type_id)) {
61 diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx
62 index ed47aa8..e58f1ab 100644
63 --- scintilla/src/Catalogue.cxx
64 +++ scintilla/src/Catalogue.cxx
65 @@ -77,122 +77,50 @@ int Scintilla_LinkLexers() {
67 //++Autogenerated -- run scripts/LexGen.py to regenerate
68 //**\(\tLINK_LEXER(\*);\n\)
83 - LINK_LEXER(lmBibTeX);
84 - LINK_LEXER(lmBlitzBasic);
85 - LINK_LEXER(lmBullant);
88 - LINK_LEXER(lmClwNoCase);
91 LINK_LEXER(lmCoffeeScript);
94 - LINK_LEXER(lmCPPNoCase);
95 - LINK_LEXER(lmCsound);
100 - LINK_LEXER(lmDMIS);
102 - LINK_LEXER(lmEDIFACT);
103 - LINK_LEXER(lmEiffel);
104 - LINK_LEXER(lmEiffelkw);
105 LINK_LEXER(lmErlang);
106 - LINK_LEXER(lmErrorList);
107 - LINK_LEXER(lmESCRIPT);
109 - LINK_LEXER(lmFlagShip);
111 LINK_LEXER(lmFortran);
112 LINK_LEXER(lmFreeBasic);
114 - LINK_LEXER(lmGui4Cli);
115 LINK_LEXER(lmHaskell);
117 - LINK_LEXER(lmIHex);
118 - LINK_LEXER(lmInno);
119 - LINK_LEXER(lmJSON);
121 - LINK_LEXER(lmKVIrc);
124 - LINK_LEXER(lmLiterateHaskell);
126 - LINK_LEXER(lmLout);
128 - LINK_LEXER(lmMagikSF);
130 LINK_LEXER(lmMarkdown);
131 - LINK_LEXER(lmMatlab);
132 - LINK_LEXER(lmMETAPOST);
133 - LINK_LEXER(lmMMIXAL);
134 - LINK_LEXER(lmModula);
135 - LINK_LEXER(lmMSSQL);
136 - LINK_LEXER(lmMySQL);
137 - LINK_LEXER(lmNimrod);
138 - LINK_LEXER(lmNncrontab);
139 + // We use Octave instead of Matlab
142 LINK_LEXER(lmOctave);
143 - LINK_LEXER(lmOpal);
144 - LINK_LEXER(lmOScript);
145 LINK_LEXER(lmPascal);
148 LINK_LEXER(lmPHPSCRIPT);
152 - LINK_LEXER(lmPowerPro);
153 LINK_LEXER(lmPowerShell);
154 - LINK_LEXER(lmProgress);
157 - LINK_LEXER(lmPureBasic);
158 LINK_LEXER(lmPython);
160 - LINK_LEXER(lmREBOL);
161 - LINK_LEXER(lmRegistry);
164 - LINK_LEXER(lmScriptol);
165 - LINK_LEXER(lmSmalltalk);
167 - LINK_LEXER(lmSorc);
168 - LINK_LEXER(lmSpecman);
169 - LINK_LEXER(lmSpice);
171 - LINK_LEXER(lmSrec);
172 - LINK_LEXER(lmSTTXT);
173 - LINK_LEXER(lmTACL);
174 - LINK_LEXER(lmTADS3);
177 - LINK_LEXER(lmTCMD);
178 - LINK_LEXER(lmTEHex);
180 LINK_LEXER(lmTxt2tags);
182 - LINK_LEXER(lmVBScript);
183 LINK_LEXER(lmVerilog);
185 - LINK_LEXER(lmVisualProlog);