Revision: 4608 http://geany.svn.sourceforge.net/geany/?rev=4608&view=rev Author: eht16 Date: 2010-01-31 16:25:14 +0000 (Sun, 31 Jan 2010)
Log Message: ----------- Backport from trunk: Map global types (read from tags files) to keyword style for filetype Java.
Modified Paths: -------------- branches/geany-0.18.1/ChangeLog branches/geany-0.18.1/src/highlighting.c
Modified: branches/geany-0.18.1/ChangeLog =================================================================== --- branches/geany-0.18.1/ChangeLog 2010-01-31 16:24:35 UTC (rev 4607) +++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:25:14 UTC (rev 4608) @@ -60,6 +60,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-09-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: branches/geany-0.18.1/src/highlighting.c =================================================================== --- branches/geany-0.18.1/src/highlighting.c 2010-01-31 16:24:35 UTC (rev 4607) +++ branches/geany-0.18.1/src/highlighting.c 2010-01-31 16:25:14 UTC (rev 4608) @@ -1575,6 +1575,9 @@ SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[2]); SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) 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.