| blob | ecb73d96b930ffb77756e6d1f36a275281df4a3b |
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 @@ -3104,6 +3104,7 @@ sptr_t ScintillaGTK::DirectFunction(
8 return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam);
9 }
11 +GEANY_API_SYMBOL
12 sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
13 ScintillaGTK *psci = reinterpret_cast<ScintillaGTK *>(sci->pscin);
14 return psci->WndProc(iMessage, wParam, lParam);
15 @@ -3115,6 +3116,7 @@ static void scintilla_init(ScintillaObject *sci);
16 extern void Platform_Initialise();
17 extern void Platform_Finalise();
19 +GEANY_API_SYMBOL
20 GType scintilla_get_type() {
21 static GType scintilla_type = 0;
22 try {
23 @@ -3252,6 +3254,7 @@ static void scintilla_init(ScintillaObject *sci) {
24 }
25 }
27 +GEANY_API_SYMBOL
28 GtkWidget* scintilla_new() {
29 GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
30 gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
31 diff --git scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
32 index be57b7c..cee3e73 100644
33 --- scintilla/gtk/scintilla-marshal.c
34 +++ scintilla/gtk/scintilla-marshal.c
35 @@ -35,8 +35,8 @@
36 #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
37 #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
38 #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
39 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_int
40 -#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint
41 +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
42 +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
43 #define g_marshal_value_peek_float(v) (v)->data[0].v_float
44 #define g_marshal_value_peek_double(v) (v)->data[0].v_double
45 #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
46 @@ -50,10 +50,10 @@
47 /* NONE:INT,POINTER (scintilla-marshal.list:1) */
48 void
49 scintilla_marshal_VOID__INT_POINTER (GClosure *closure,
50 - GValue *return_value,
51 + GValue *return_value G_GNUC_UNUSED,
52 guint n_param_values,
53 const GValue *param_values,
54 - gpointer invocation_hint,
55 + gpointer invocation_hint G_GNUC_UNUSED,
56 gpointer marshal_data)
57 {
58 typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1,
59 diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx
60 index b02a010..400d423 100644
61 --- scintilla/src/Catalogue.cxx
62 +++ scintilla/src/Catalogue.cxx
63 @@ -76,120 +76,50 @@ int Scintilla_LinkLexers() {
65 //++Autogenerated -- run scripts/LexGen.py to regenerate
66 //**\(\tLINK_LEXER(\*);\n\)
67 - LINK_LEXER(lmA68k);
68 LINK_LEXER(lmAbaqus);
69 LINK_LEXER(lmAda);
70 - LINK_LEXER(lmAPDL);
71 - LINK_LEXER(lmAs);
72 LINK_LEXER(lmAsm);
73 - LINK_LEXER(lmAsn1);
74 - LINK_LEXER(lmASY);
75 - LINK_LEXER(lmAU3);
76 - LINK_LEXER(lmAVE);
77 - LINK_LEXER(lmAVS);
78 - LINK_LEXER(lmBaan);
79 LINK_LEXER(lmBash);
80 LINK_LEXER(lmBatch);
81 - LINK_LEXER(lmBibTeX);
82 - LINK_LEXER(lmBlitzBasic);
83 - LINK_LEXER(lmBullant);
84 LINK_LEXER(lmCaml);
85 - LINK_LEXER(lmClw);
86 - LINK_LEXER(lmClwNoCase);
87 LINK_LEXER(lmCmake);
88 LINK_LEXER(lmCOBOL);
89 LINK_LEXER(lmCoffeeScript);
90 - LINK_LEXER(lmConf);
91 LINK_LEXER(lmCPP);
92 - LINK_LEXER(lmCPPNoCase);
93 - LINK_LEXER(lmCsound);
94 LINK_LEXER(lmCss);
95 LINK_LEXER(lmD);
96 LINK_LEXER(lmDiff);
97 - LINK_LEXER(lmDMAP);
98 - LINK_LEXER(lmDMIS);
99 - LINK_LEXER(lmECL);
100 - LINK_LEXER(lmEiffel);
101 - LINK_LEXER(lmEiffelkw);
102 LINK_LEXER(lmErlang);
103 - LINK_LEXER(lmErrorList);
104 - LINK_LEXER(lmESCRIPT);
105 LINK_LEXER(lmF77);
106 - LINK_LEXER(lmFlagShip);
107 LINK_LEXER(lmForth);
108 LINK_LEXER(lmFortran);
109 LINK_LEXER(lmFreeBasic);
110 - LINK_LEXER(lmGAP);
111 - LINK_LEXER(lmGui4Cli);
112 LINK_LEXER(lmHaskell);
113 LINK_LEXER(lmHTML);
114 - LINK_LEXER(lmIHex);
115 - LINK_LEXER(lmInno);
116 - LINK_LEXER(lmKix);
117 - LINK_LEXER(lmKVIrc);
118 LINK_LEXER(lmLatex);
119 LINK_LEXER(lmLISP);
120 - LINK_LEXER(lmLiterateHaskell);
121 - LINK_LEXER(lmLot);
122 - LINK_LEXER(lmLout);
123 LINK_LEXER(lmLua);
124 - LINK_LEXER(lmMagikSF);
125 LINK_LEXER(lmMake);
126 LINK_LEXER(lmMarkdown);
127 - LINK_LEXER(lmMatlab);
128 - LINK_LEXER(lmMETAPOST);
129 - LINK_LEXER(lmMMIXAL);
130 - LINK_LEXER(lmModula);
131 - LINK_LEXER(lmMSSQL);
132 - LINK_LEXER(lmMySQL);
133 - LINK_LEXER(lmNimrod);
134 - LINK_LEXER(lmNncrontab);
135 + // We use Octave instead of Matlab
136 LINK_LEXER(lmNsis);
137 LINK_LEXER(lmNull);
138 LINK_LEXER(lmOctave);
139 - LINK_LEXER(lmOpal);
140 - LINK_LEXER(lmOScript);
141 LINK_LEXER(lmPascal);
142 - LINK_LEXER(lmPB);
143 LINK_LEXER(lmPerl);
144 LINK_LEXER(lmPHPSCRIPT);
145 - LINK_LEXER(lmPLM);
146 LINK_LEXER(lmPO);
147 - LINK_LEXER(lmPOV);
148 - LINK_LEXER(lmPowerPro);
149 LINK_LEXER(lmPowerShell);
150 - LINK_LEXER(lmProgress);
151 LINK_LEXER(lmProps);
152 - LINK_LEXER(lmPS);
153 - LINK_LEXER(lmPureBasic);
154 LINK_LEXER(lmPython);
155 LINK_LEXER(lmR);
156 - LINK_LEXER(lmREBOL);
157 - LINK_LEXER(lmRegistry);
158 LINK_LEXER(lmRuby);
159 LINK_LEXER(lmRust);
160 - LINK_LEXER(lmScriptol);
161 - LINK_LEXER(lmSmalltalk);
162 - LINK_LEXER(lmSML);
163 - LINK_LEXER(lmSorc);
164 - LINK_LEXER(lmSpecman);
165 - LINK_LEXER(lmSpice);
166 LINK_LEXER(lmSQL);
167 - LINK_LEXER(lmSrec);
168 - LINK_LEXER(lmSTTXT);
169 - LINK_LEXER(lmTACL);
170 - LINK_LEXER(lmTADS3);
171 - LINK_LEXER(lmTAL);
172 LINK_LEXER(lmTCL);
173 - LINK_LEXER(lmTCMD);
174 - LINK_LEXER(lmTEHex);
175 - LINK_LEXER(lmTeX);
176 LINK_LEXER(lmTxt2tags);
177 - LINK_LEXER(lmVB);
178 - LINK_LEXER(lmVBScript);
179 LINK_LEXER(lmVerilog);
180 LINK_LEXER(lmVHDL);
181 - LINK_LEXER(lmVisualProlog);
182 LINK_LEXER(lmXML);
183 LINK_LEXER(lmYAML);