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