| blob | e57ea095c6f1a4936eb559f940af8bf2876e4430 |
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
6 @@ -35,8 +35,8 @@
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
17 @@ -50,10 +50,10 @@
18 /* NONE:INT,POINTER (scintilla-marshal.list:1) */
19 void
20 scintilla_marshal_VOID__INT_POINTER (GClosure *closure,
21 - GValue *return_value,
22 + GValue *return_value G_GNUC_UNUSED,
23 guint n_param_values,
24 const GValue *param_values,
25 - gpointer invocation_hint,
26 + gpointer invocation_hint G_GNUC_UNUSED,
27 gpointer marshal_data)
28 {
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,115 +76,48 @@ int Scintilla_LinkLexers() {
36 //++Autogenerated -- run scripts/LexGen.py to regenerate
37 //**\(\tLINK_LEXER(\*);\n\)
38 - LINK_LEXER(lmA68k);
39 LINK_LEXER(lmAbaqus);
40 LINK_LEXER(lmAda);
41 - LINK_LEXER(lmAPDL);
42 - LINK_LEXER(lmAs);
43 LINK_LEXER(lmAsm);
44 - LINK_LEXER(lmAsn1);
45 - LINK_LEXER(lmASY);
46 - LINK_LEXER(lmAU3);
47 - LINK_LEXER(lmAVE);
48 - LINK_LEXER(lmAVS);
49 - LINK_LEXER(lmBaan);
50 LINK_LEXER(lmBash);
51 LINK_LEXER(lmBatch);
52 - LINK_LEXER(lmBlitzBasic);
53 - LINK_LEXER(lmBullant);
54 LINK_LEXER(lmCaml);
55 - LINK_LEXER(lmClw);
56 - LINK_LEXER(lmClwNoCase);
57 LINK_LEXER(lmCmake);
58 LINK_LEXER(lmCOBOL);
59 - LINK_LEXER(lmCoffeeScript);
60 - LINK_LEXER(lmConf);
61 LINK_LEXER(lmCPP);
62 - LINK_LEXER(lmCPPNoCase);
63 - LINK_LEXER(lmCsound);
64 LINK_LEXER(lmCss);
65 LINK_LEXER(lmD);
66 LINK_LEXER(lmDiff);
67 - LINK_LEXER(lmDMAP);
68 - LINK_LEXER(lmDMIS);
69 - LINK_LEXER(lmECL);
70 - LINK_LEXER(lmEiffel);
71 - LINK_LEXER(lmEiffelkw);
72 LINK_LEXER(lmErlang);
73 - LINK_LEXER(lmErrorList);
74 - LINK_LEXER(lmESCRIPT);
75 LINK_LEXER(lmF77);
76 - LINK_LEXER(lmFlagShip);
77 LINK_LEXER(lmForth);
78 LINK_LEXER(lmFortran);
79 LINK_LEXER(lmFreeBasic);
80 - LINK_LEXER(lmGAP);
81 - LINK_LEXER(lmGui4Cli);
82 LINK_LEXER(lmHaskell);
83 LINK_LEXER(lmHTML);
84 - LINK_LEXER(lmInno);
85 - LINK_LEXER(lmKix);
86 - LINK_LEXER(lmKVIrc);
87 LINK_LEXER(lmLatex);
88 LINK_LEXER(lmLISP);
89 - LINK_LEXER(lmLiterateHaskell);
90 - LINK_LEXER(lmLot);
91 - LINK_LEXER(lmLout);
92 LINK_LEXER(lmLua);
93 - LINK_LEXER(lmMagikSF);
94 LINK_LEXER(lmMake);
95 LINK_LEXER(lmMarkdown);
96 - LINK_LEXER(lmMatlab);
97 - LINK_LEXER(lmMETAPOST);
98 - LINK_LEXER(lmMMIXAL);
99 - LINK_LEXER(lmModula);
100 - LINK_LEXER(lmMSSQL);
101 - LINK_LEXER(lmMySQL);
102 - LINK_LEXER(lmNimrod);
103 - LINK_LEXER(lmNncrontab);
104 + // We use Octave instead of Matlab
105 LINK_LEXER(lmNsis);
106 LINK_LEXER(lmNull);
107 LINK_LEXER(lmOctave);
108 - LINK_LEXER(lmOpal);
109 - LINK_LEXER(lmOScript);
110 LINK_LEXER(lmPascal);
111 - LINK_LEXER(lmPB);
112 LINK_LEXER(lmPerl);
113 - LINK_LEXER(lmPHPSCRIPT);
114 - LINK_LEXER(lmPLM);
115 LINK_LEXER(lmPO);
116 - LINK_LEXER(lmPOV);
117 - LINK_LEXER(lmPowerPro);
118 LINK_LEXER(lmPowerShell);
119 - LINK_LEXER(lmProgress);
120 LINK_LEXER(lmProps);
121 - LINK_LEXER(lmPS);
122 - LINK_LEXER(lmPureBasic);
123 LINK_LEXER(lmPython);
124 LINK_LEXER(lmR);
125 - LINK_LEXER(lmREBOL);
126 LINK_LEXER(lmRuby);
127 LINK_LEXER(lmRust);
128 - LINK_LEXER(lmScriptol);
129 - LINK_LEXER(lmSmalltalk);
130 - LINK_LEXER(lmSML);
131 - LINK_LEXER(lmSorc);
132 - LINK_LEXER(lmSpecman);
133 - LINK_LEXER(lmSpice);
134 LINK_LEXER(lmSQL);
135 - LINK_LEXER(lmSTTXT);
136 - LINK_LEXER(lmTACL);
137 - LINK_LEXER(lmTADS3);
138 - LINK_LEXER(lmTAL);
139 LINK_LEXER(lmTCL);
140 - LINK_LEXER(lmTCMD);
141 - LINK_LEXER(lmTeX);
142 LINK_LEXER(lmTxt2tags);
143 - LINK_LEXER(lmVB);
144 - LINK_LEXER(lmVBScript);
145 LINK_LEXER(lmVerilog);
146 LINK_LEXER(lmVHDL);
147 - LINK_LEXER(lmVisualProlog);
148 LINK_LEXER(lmXML);
149 LINK_LEXER(lmYAML);