SF.net SVN: geany:[5445] branches/unstable

[eht16 at users.sourceforge.net]

Revision: 5445
          http://geany.svn.sourceforge.net/geany/?rev=5445&view=rev
Author:   eht16
Date:     2010-11-28 15:37:13 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
Update for Scintilla 2.22.

Modified Paths:
--------------
    branches/unstable/ChangeLog
    branches/unstable/scintilla/scintilla_changes.patch

Modified: branches/unstable/ChangeLog
===================================================================
--- branches/unstable/ChangeLog	2010-11-28 15:27:43 UTC (rev 5444)
+++ branches/unstable/ChangeLog	2010-11-28 15:37:13 UTC (rev 5445)
@@ -4,6 +4,8 @@
    data/filetypes.cs, data/filetypes.c:
    Disable preprocessor #define tracking for the CPP lexer
    (enabled by default in Scintilla).
+ * scintilla/scintilla_changes.patch:
+   Update for Scintilla 2.22.
 
 
 2010-11-24  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: branches/unstable/scintilla/scintilla_changes.patch
===================================================================
--- branches/unstable/scintilla/scintilla_changes.patch	2010-11-28 15:27:43 UTC (rev 5444)
+++ branches/unstable/scintilla/scintilla_changes.patch	2010-11-28 15:37:13 UTC (rev 5445)
@@ -1,8 +1,8 @@
-A patch to Scintilla 2.03 containing our changes to Scintilla
+A patch to Scintilla 2.22 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
+diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
+--- scintilla_orig/gtk/scintilla-marshal.c	2010-09-04 12:03:35.000000000 +0200
++++ scintilla/gtk/scintilla-marshal.c	2008-12-06 12:11:33.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
@@ -27,15 +27,15 @@
                                       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 @@
+diff -Naur scintilla_orig/src/Catalogue.cxx scintilla/src/Catalogue.cxx
+--- scintilla_orig/src/Catalogue.cxx	2010-09-04 12:03:35.000000000 +0200
++++ scintilla/src/Catalogue.cxx	2010-11-21 18:00:07.000000000 +0100
+@@ -81,98 +81,41 @@
 
  //++Autogenerated -- run src/LexGen.py to regenerate
  //**\(\tLINK_LEXER(\*);\n\)
 -	LINK_LEXER(lmAbaqus);
--	LINK_LEXER(lmAda);
+ 	LINK_LEXER(lmAda);
 -	LINK_LEXER(lmAns1);
 -	LINK_LEXER(lmAPDL);
  	LINK_LEXER(lmAsm);
@@ -61,12 +61,12 @@
  	LINK_LEXER(lmDiff);
 -	LINK_LEXER(lmEiffel);
 -	LINK_LEXER(lmEiffelkw);
--	LINK_LEXER(lmErlang);
+ 	LINK_LEXER(lmErlang);
 -	LINK_LEXER(lmErrorList);
 -	LINK_LEXER(lmESCRIPT);
  	LINK_LEXER(lmF77);
 -	LINK_LEXER(lmFlagShip);
--	LINK_LEXER(lmForth);
+ 	LINK_LEXER(lmForth);
  	LINK_LEXER(lmFortran);
  	LINK_LEXER(lmFreeBasic);
 -	LINK_LEXER(lmGAP);
@@ -76,23 +76,24 @@
 -	LINK_LEXER(lmInno);
 -	LINK_LEXER(lmKix);
  	LINK_LEXER(lmLatex);
--	LINK_LEXER(lmLISP);
+ 	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(lmMatlab);
 -	LINK_LEXER(lmMETAPOST);
 -	LINK_LEXER(lmMMIXAL);
 -	LINK_LEXER(lmMSSQL);
 -	LINK_LEXER(lmMySQL);
 -	LINK_LEXER(lmNimrod);
 -	LINK_LEXER(lmNncrontab);
++	// We use Octave instead of Matlab
  	LINK_LEXER(lmNsis);
  	LINK_LEXER(lmNull);
--	LINK_LEXER(lmOctave);
+ 	LINK_LEXER(lmOctave);
 -	LINK_LEXER(lmOpal);
  	LINK_LEXER(lmPascal);
 -	LINK_LEXER(lmPB);
@@ -123,11 +124,9 @@
 -	LINK_LEXER(lmTAL);
  	LINK_LEXER(lmTCL);
 -	LINK_LEXER(lmTeX);
+ 	LINK_LEXER(lmTxt2tags);
 -	LINK_LEXER(lmVB);
 -	LINK_LEXER(lmVBScript);
--	LINK_LEXER(lmVerilog);
+ 	LINK_LEXER(lmVerilog);
  	LINK_LEXER(lmVHDL);
-+	LINK_LEXER(lmVerilog);
  	LINK_LEXER(lmXML);
- 	LINK_LEXER(lmYAML);
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.