SF.net SVN: geany:[5174] trunk

[ntrel at users.sourceforge.net]

Revision: 5174
          http://geany.svn.sourceforge.net/geany/?rev=5174&view=rev
Author:   ntrel
Date:     2010-08-17 14:07:58 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
Use Octave lexer instead of Matlab to support Octave # comment char.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-17 13:51:59 UTC (rev 5173)
+++ trunk/ChangeLog	2010-08-17 14:07:58 UTC (rev 5174)
@@ -1,3 +1,9 @@
+2010-08-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/highlighting.c, src/editor.c:
+   Use Octave lexer instead of Matlab to support Octave # comment char.
+
+
 2010-08-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/filetypes.c:

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2010-08-17 13:51:59 UTC (rev 5173)
+++ trunk/src/editor.c	2010-08-17 14:07:58 UTC (rev 5174)
@@ -3427,7 +3427,7 @@
 			return (style == SCE_B_STRING ||
 				style == SCE_B_STRINGEOL);
 
-		case SCLEX_MATLAB:
+		case SCLEX_OCTAVE:
 			return (style == SCE_MATLAB_STRING ||
 				style == SCE_MATLAB_DOUBLEQUOTESTRING);
 
@@ -3557,7 +3557,7 @@
 				style == SCE_TCL_COMMENT_BOX ||
 				style == SCE_TCL_BLOCK_COMMENT);
 
-		case SCLEX_MATLAB:
+		case SCLEX_OCTAVE:
 			return (style == SCE_MATLAB_COMMENT);
 
 		case SCLEX_LUA:
@@ -4971,7 +4971,7 @@
 		case SCLEX_VHDL:
 		case SCLEX_FREEBASIC:
 		case SCLEX_D:
-		case SCLEX_MATLAB:
+		case SCLEX_OCTAVE:
 			mode = SC_IV_LOOKBOTH;
 			break;
 

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2010-08-17 13:51:59 UTC (rev 5173)
+++ trunk/src/highlighting.c	2010-08-17 14:07:58 UTC (rev 5174)
@@ -2550,7 +2550,8 @@
 
 static void styleset_matlab(ScintillaObject *sci, gint ft_id)
 {
-	apply_filetype_properties(sci, SCLEX_MATLAB, ft_id);
+	/* We use SCLEX_OCTAVE instead of SCLEX_MATLAB to also support Octave # comment char */
+	apply_filetype_properties(sci, SCLEX_OCTAVE, ft_id);
 
 	sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]);
 


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