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