SF.net SVN: geany:[4270] trunk

[ntrel at users.sourceforge.net]

Revision: 4270
          http://geany.svn.sourceforge.net/geany/?rev=4270&view=rev
Author:   ntrel
Date:     2009-09-30 12:10:24 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
Add Vala keywords to conf file.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.vala
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-29 16:29:15 UTC (rev 4269)
+++ trunk/ChangeLog	2009-09-30 12:10:24 UTC (rev 4270)
@@ -1,3 +1,9 @@
+2009-09-30  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/highlighting.c, data/filetypes.vala:
+   Add Vala keywords to conf file.
+
+
 2009-09-29  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/symbols.c, tagmanager/perl.c:

Modified: trunk/data/filetypes.vala
===================================================================
--- trunk/data/filetypes.vala	2009-09-29 16:29:15 UTC (rev 4269)
+++ trunk/data/filetypes.vala	2009-09-30 12:10:24 UTC (rev 4270)
@@ -26,10 +26,10 @@
 
 [keywords]
 # all items must be in one line
-#primary=
+primary=else if switch case default break continue return for foreach in do while is try catch finally throw namespace interface class struct enum signal errordomain construct callback get set base const static var weak virtual abstract override inline extern public protected private delegate out ref lock using true false null generic new delete base this value typeof sizeof throws requires ensures void bool char uchar int uint short ushort long ulong size_t ssize_t int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string constpointer time_t
 #secondary=
 # these are some doxygen keywords (incomplete)
-#docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
+docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
 
 [settings]
 # default extension used when saving files

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-09-29 16:29:15 UTC (rev 4269)
+++ trunk/src/highlighting.c	2009-09-30 12:10:24 UTC (rev 4270)
@@ -1329,6 +1329,7 @@
 		keywords = (set_keywords) ? style_sets[GEANY_FILETYPES_XML].keywords[i] : "";
 		sci_set_keywords(sci, i, keywords);
 	}
+	/* always set SGML keywords */
 	sci_set_keywords(sci, 5, style_sets[GEANY_FILETYPES_XML].keywords[5]);
 
 	set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_XML, 0);


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