SF.net SVN: geany:[4287] trunk

[eht16 at users.sourceforge.net]

Revision: 4287
          http://geany.svn.sourceforge.net/geany/?rev=4287&view=rev
Author:   eht16
Date:     2009-10-03 16:35:34 +0000 (Sat, 03 Oct 2009)

Log Message:
-----------
Map global types (read from tags files) to keyword style for filetype Java.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-03 16:17:22 UTC (rev 4286)
+++ trunk/ChangeLog	2009-10-03 16:35:34 UTC (rev 4287)
@@ -6,6 +6,9 @@
  * src/printing.c:
    Enable embedded page setup properties in the (Unix) Print dialog
    on newer GTK versions (closes #2870596).
+ * src/highlighting.c:
+   Map global types (read from tags files) to keyword style for
+   filetype Java.
 
 
 2009-10-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-10-03 16:17:22 UTC (rev 4286)
+++ trunk/src/highlighting.c	2009-10-03 16:35:34 UTC (rev 4287)
@@ -1502,6 +1502,9 @@
 	sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_JAVA].keywords[2]);
 	sci_set_keywords(sci, 4, style_sets[GEANY_FILETYPES_JAVA].keywords[3]);
 
+	/* assign global types, merge them with user defined keywords and set them */
+	assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang);
+
 	styleset_c_like(sci, GEANY_FILETYPES_JAVA);
 }
 


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