7396f7672d
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4723 ea778897-0a13-0410-b9d1-a72fbfd435f5
134 lines
4.2 KiB
Diff
134 lines
4.2 KiB
Diff
A patch to Scintilla 2.03 containing our changes to Scintilla
|
|
(removing unused lexers and an updated marshallers file).
|
|
diff -Naur scintilla_orig//gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
|
|
--- scintilla_orig//gtk/scintilla-marshal.c 2004-04-04 11:59:37.000000000 +0200
|
|
+++ scintilla/gtk/scintilla-marshal.c 2010-03-07 10:39:08.000000000 +0100
|
|
@@ -35,8 +35,8 @@
|
|
#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
|
|
#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
|
|
#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
|
|
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_int
|
|
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint
|
|
+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
|
|
+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
|
|
#define g_marshal_value_peek_float(v) (v)->data[0].v_float
|
|
#define g_marshal_value_peek_double(v) (v)->data[0].v_double
|
|
#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
|
|
@@ -50,10 +50,10 @@
|
|
/* NONE:INT,POINTER (scintilla-marshal.list:1) */
|
|
void
|
|
scintilla_marshal_VOID__INT_POINTER (GClosure *closure,
|
|
- GValue *return_value,
|
|
+ GValue *return_value G_GNUC_UNUSED,
|
|
guint n_param_values,
|
|
const GValue *param_values,
|
|
- gpointer invocation_hint,
|
|
+ gpointer invocation_hint G_GNUC_UNUSED,
|
|
gpointer marshal_data)
|
|
{
|
|
typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1,
|
|
diff -Naur scintilla_orig//src/KeyWords.cxx scintilla/src/KeyWords.cxx
|
|
--- scintilla_orig//src/KeyWords.cxx 2009-08-27 03:20:38.000000000 +0200
|
|
+++ scintilla/src/KeyWords.cxx 2010-03-07 10:38:53.000000000 +0100
|
|
@@ -327,99 +327,37 @@
|
|
|
|
//++Autogenerated -- run src/LexGen.py to regenerate
|
|
//**\(\tLINK_LEXER(\*);\n\)
|
|
- LINK_LEXER(lmAbaqus);
|
|
- LINK_LEXER(lmAda);
|
|
- LINK_LEXER(lmAns1);
|
|
- LINK_LEXER(lmAPDL);
|
|
LINK_LEXER(lmAsm);
|
|
- LINK_LEXER(lmASY);
|
|
- LINK_LEXER(lmAU3);
|
|
- LINK_LEXER(lmAVE);
|
|
- LINK_LEXER(lmBaan);
|
|
LINK_LEXER(lmBash);
|
|
- LINK_LEXER(lmBatch);
|
|
- LINK_LEXER(lmBlitzBasic);
|
|
- LINK_LEXER(lmBullant);
|
|
LINK_LEXER(lmCaml);
|
|
- LINK_LEXER(lmClw);
|
|
- LINK_LEXER(lmClwNoCase);
|
|
LINK_LEXER(lmCmake);
|
|
- LINK_LEXER(lmCOBOL);
|
|
- LINK_LEXER(lmConf);
|
|
LINK_LEXER(lmCPP);
|
|
- LINK_LEXER(lmCPPNoCase);
|
|
- LINK_LEXER(lmCsound);
|
|
LINK_LEXER(lmCss);
|
|
LINK_LEXER(lmD);
|
|
LINK_LEXER(lmDiff);
|
|
- LINK_LEXER(lmEiffel);
|
|
- LINK_LEXER(lmEiffelkw);
|
|
- LINK_LEXER(lmErlang);
|
|
- LINK_LEXER(lmErrorList);
|
|
- LINK_LEXER(lmESCRIPT);
|
|
LINK_LEXER(lmF77);
|
|
- LINK_LEXER(lmFlagShip);
|
|
- LINK_LEXER(lmForth);
|
|
LINK_LEXER(lmFortran);
|
|
LINK_LEXER(lmFreeBasic);
|
|
- LINK_LEXER(lmGAP);
|
|
- LINK_LEXER(lmGui4Cli);
|
|
LINK_LEXER(lmHaskell);
|
|
LINK_LEXER(lmHTML);
|
|
- LINK_LEXER(lmInno);
|
|
- LINK_LEXER(lmKix);
|
|
LINK_LEXER(lmLatex);
|
|
- LINK_LEXER(lmLISP);
|
|
- LINK_LEXER(lmLot);
|
|
- LINK_LEXER(lmLout);
|
|
LINK_LEXER(lmLua);
|
|
- LINK_LEXER(lmMagikSF);
|
|
LINK_LEXER(lmMake);
|
|
LINK_LEXER(lmMarkdown);
|
|
LINK_LEXER(lmMatlab);
|
|
- LINK_LEXER(lmMETAPOST);
|
|
- LINK_LEXER(lmMMIXAL);
|
|
- LINK_LEXER(lmMSSQL);
|
|
- LINK_LEXER(lmMySQL);
|
|
- LINK_LEXER(lmNimrod);
|
|
- LINK_LEXER(lmNncrontab);
|
|
LINK_LEXER(lmNsis);
|
|
LINK_LEXER(lmNull);
|
|
- LINK_LEXER(lmOctave);
|
|
- LINK_LEXER(lmOpal);
|
|
LINK_LEXER(lmPascal);
|
|
- LINK_LEXER(lmPB);
|
|
LINK_LEXER(lmPerl);
|
|
- LINK_LEXER(lmPHPSCRIPT);
|
|
- LINK_LEXER(lmPLM);
|
|
LINK_LEXER(lmPo);
|
|
- LINK_LEXER(lmPOV);
|
|
- LINK_LEXER(lmPowerPro);
|
|
- LINK_LEXER(lmPowerShell);
|
|
- LINK_LEXER(lmProgress);
|
|
LINK_LEXER(lmProps);
|
|
- LINK_LEXER(lmPS);
|
|
- LINK_LEXER(lmPureBasic);
|
|
LINK_LEXER(lmPython);
|
|
LINK_LEXER(lmR);
|
|
- LINK_LEXER(lmREBOL);
|
|
LINK_LEXER(lmRuby);
|
|
- LINK_LEXER(lmScriptol);
|
|
- LINK_LEXER(lmSmalltalk);
|
|
- LINK_LEXER(lmSML);
|
|
- LINK_LEXER(lmSorc);
|
|
- LINK_LEXER(lmSpecman);
|
|
- LINK_LEXER(lmSpice);
|
|
LINK_LEXER(lmSQL);
|
|
- LINK_LEXER(lmTACL);
|
|
- LINK_LEXER(lmTADS3);
|
|
- LINK_LEXER(lmTAL);
|
|
LINK_LEXER(lmTCL);
|
|
- LINK_LEXER(lmTeX);
|
|
- LINK_LEXER(lmVB);
|
|
- LINK_LEXER(lmVBScript);
|
|
- LINK_LEXER(lmVerilog);
|
|
LINK_LEXER(lmVHDL);
|
|
+ LINK_LEXER(lmVerilog);
|
|
LINK_LEXER(lmXML);
|
|
LINK_LEXER(lmYAML);
|
|
|