1 A patch to Scintilla 2.29 containing our changes to Scintilla
2 (removing unused lexers and an updated marshallers file).
3 diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
4 --- scintilla_orig/gtk/scintilla-marshal.c 2010-10-27 23:15:45.000000000 +0200
5 +++ scintilla/gtk/scintilla-marshal.c 2011-04-03 17:42:59.000000000 +0200
7 #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
8 #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
9 #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
10 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_int
11 -#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint
12 +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
13 +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
14 #define g_marshal_value_peek_float(v) (v)->data[0].v_float
15 #define g_marshal_value_peek_double(v) (v)->data[0].v_double
16 #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
18 /* NONE:INT,POINTER (scintilla-marshal.list:1) */
20 scintilla_marshal_VOID__INT_POINTER (GClosure *closure,
21 - GValue *return_value,
22 + GValue *return_value G_GNUC_UNUSED,
24 const GValue *param_values,
25 - gpointer invocation_hint,
26 + gpointer invocation_hint G_GNUC_UNUSED,
27 gpointer marshal_data)
29 typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1,
30 diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx
31 index 41d5d54..70ce3bc 100644
32 --- scintilla/src/Catalogue.cxx
33 +++ scintilla/src/Catalogue.cxx
34 @@ -76,117 +76,48 @@ int Scintilla_LinkLexers() {
36 //++Autogenerated -- run scripts/LexGen.py to regenerate
37 //**\(\tLINK_LEXER(\*);\n\)
52 - LINK_LEXER(lmBibTeX);
53 - LINK_LEXER(lmBlitzBasic);
54 - LINK_LEXER(lmBullant);
57 - LINK_LEXER(lmClwNoCase);
60 - LINK_LEXER(lmCoffeeScript);
63 - LINK_LEXER(lmCPPNoCase);
64 - LINK_LEXER(lmCsound);
71 - LINK_LEXER(lmEiffel);
72 - LINK_LEXER(lmEiffelkw);
74 - LINK_LEXER(lmErrorList);
75 - LINK_LEXER(lmESCRIPT);
77 - LINK_LEXER(lmFlagShip);
79 LINK_LEXER(lmFortran);
80 LINK_LEXER(lmFreeBasic);
82 - LINK_LEXER(lmGui4Cli);
83 LINK_LEXER(lmHaskell);
87 - LINK_LEXER(lmKVIrc);
90 - LINK_LEXER(lmLiterateHaskell);
94 - LINK_LEXER(lmMagikSF);
96 LINK_LEXER(lmMarkdown);
97 - LINK_LEXER(lmMatlab);
98 - LINK_LEXER(lmMETAPOST);
99 - LINK_LEXER(lmMMIXAL);
100 - LINK_LEXER(lmModula);
101 - LINK_LEXER(lmMSSQL);
102 - LINK_LEXER(lmMySQL);
103 - LINK_LEXER(lmNimrod);
104 - LINK_LEXER(lmNncrontab);
105 + // We use Octave instead of Matlab
108 LINK_LEXER(lmOctave);
109 - LINK_LEXER(lmOpal);
110 - LINK_LEXER(lmOScript);
111 LINK_LEXER(lmPascal);
114 - LINK_LEXER(lmPHPSCRIPT);
118 - LINK_LEXER(lmPowerPro);
119 LINK_LEXER(lmPowerShell);
120 - LINK_LEXER(lmProgress);
123 - LINK_LEXER(lmPureBasic);
124 LINK_LEXER(lmPython);
126 - LINK_LEXER(lmREBOL);
127 - LINK_LEXER(lmRegistry);
130 - LINK_LEXER(lmScriptol);
131 - LINK_LEXER(lmSmalltalk);
133 - LINK_LEXER(lmSorc);
134 - LINK_LEXER(lmSpecman);
135 - LINK_LEXER(lmSpice);
137 - LINK_LEXER(lmSTTXT);
138 - LINK_LEXER(lmTACL);
139 - LINK_LEXER(lmTADS3);
142 - LINK_LEXER(lmTCMD);
144 LINK_LEXER(lmTxt2tags);
146 - LINK_LEXER(lmVBScript);
147 LINK_LEXER(lmVerilog);
149 - LINK_LEXER(lmVisualProlog);