| blob | 20afac3de88412e5d0659f3e2512f0b7e895011c |
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 -Naur scintilla_orig/src/Catalogue.cxx scintilla/src/Catalogue.cxx
31 --- scintilla_orig/src/Catalogue.cxx 2011-03-17 23:41:24.000000000 +0100
32 +++ scintilla/src/Catalogue.cxx 2011-04-03 17:43:45.000000000 +0200
33 @@ -81,100 +81,42 @@
35 //++Autogenerated -- run src/LexGen.py to regenerate
36 //**\(\tLINK_LEXER(\*);\n\)
37 - LINK_LEXER(lmA68k);
38 - LINK_LEXER(lmAbaqus);
39 LINK_LEXER(lmAda);
40 - LINK_LEXER(lmAns1);
41 - LINK_LEXER(lmAPDL);
42 LINK_LEXER(lmAsm);
43 - LINK_LEXER(lmASY);
44 - LINK_LEXER(lmAU3);
45 - LINK_LEXER(lmAVE);
46 - LINK_LEXER(lmBaan);
47 LINK_LEXER(lmBash);
48 - LINK_LEXER(lmBatch);
49 - LINK_LEXER(lmBlitzBasic);
50 - LINK_LEXER(lmBullant);
51 LINK_LEXER(lmCaml);
52 - LINK_LEXER(lmClw);
53 - LINK_LEXER(lmClwNoCase);
54 LINK_LEXER(lmCmake);
55 LINK_LEXER(lmCOBOL);
56 - LINK_LEXER(lmConf);
57 LINK_LEXER(lmCPP);
58 - LINK_LEXER(lmCPPNoCase);
59 - LINK_LEXER(lmCsound);
60 LINK_LEXER(lmCss);
61 LINK_LEXER(lmD);
62 LINK_LEXER(lmDiff);
63 - LINK_LEXER(lmEiffel);
64 - LINK_LEXER(lmEiffelkw);
65 LINK_LEXER(lmErlang);
66 - LINK_LEXER(lmErrorList);
67 - LINK_LEXER(lmESCRIPT);
68 LINK_LEXER(lmF77);
69 - LINK_LEXER(lmFlagShip);
70 LINK_LEXER(lmForth);
71 LINK_LEXER(lmFortran);
72 LINK_LEXER(lmFreeBasic);
73 - LINK_LEXER(lmGAP);
74 - LINK_LEXER(lmGui4Cli);
75 LINK_LEXER(lmHaskell);
76 LINK_LEXER(lmHTML);
77 - LINK_LEXER(lmInno);
78 - LINK_LEXER(lmKix);
79 LINK_LEXER(lmLatex);
80 LINK_LEXER(lmLISP);
81 - LINK_LEXER(lmLot);
82 - LINK_LEXER(lmLout);
83 LINK_LEXER(lmLua);
84 - LINK_LEXER(lmMagikSF);
85 LINK_LEXER(lmMake);
86 LINK_LEXER(lmMarkdown);
87 - LINK_LEXER(lmMatlab);
88 - LINK_LEXER(lmMETAPOST);
89 - LINK_LEXER(lmMMIXAL);
90 - LINK_LEXER(lmModula);
91 - LINK_LEXER(lmMSSQL);
92 - LINK_LEXER(lmMySQL);
93 - LINK_LEXER(lmNimrod);
94 - LINK_LEXER(lmNncrontab);
95 + // We use Octave instead of Matlab
96 LINK_LEXER(lmNsis);
97 LINK_LEXER(lmNull);
98 LINK_LEXER(lmOctave);
99 - LINK_LEXER(lmOpal);
100 LINK_LEXER(lmPascal);
101 - LINK_LEXER(lmPB);
102 LINK_LEXER(lmPerl);
103 - LINK_LEXER(lmPHPSCRIPT);
104 - LINK_LEXER(lmPLM);
105 LINK_LEXER(lmPo);
106 - LINK_LEXER(lmPOV);
107 - LINK_LEXER(lmPowerPro);
108 - LINK_LEXER(lmPowerShell);
109 - LINK_LEXER(lmProgress);
110 LINK_LEXER(lmProps);
111 - LINK_LEXER(lmPS);
112 - LINK_LEXER(lmPureBasic);
113 LINK_LEXER(lmPython);
114 LINK_LEXER(lmR);
115 - LINK_LEXER(lmREBOL);
116 LINK_LEXER(lmRuby);
117 - LINK_LEXER(lmScriptol);
118 - LINK_LEXER(lmSmalltalk);
119 - LINK_LEXER(lmSML);
120 - LINK_LEXER(lmSorc);
121 - LINK_LEXER(lmSpecman);
122 - LINK_LEXER(lmSpice);
123 LINK_LEXER(lmSQL);
124 - LINK_LEXER(lmTACL);
125 - LINK_LEXER(lmTADS3);
126 - LINK_LEXER(lmTAL);
127 LINK_LEXER(lmTCL);
128 - LINK_LEXER(lmTeX);
129 LINK_LEXER(lmTxt2tags);
130 - LINK_LEXER(lmVB);
131 - LINK_LEXER(lmVBScript);
132 LINK_LEXER(lmVerilog);
133 LINK_LEXER(lmVHDL);
134 LINK_LEXER(lmXML);