SF.net SVN: geany:[4433] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Wed Nov 18 17:07:13 UTC 2009

Revision: 4433
Author:   ntrel
Date:     2009-11-18 17:07:12 +0000 (Wed, 18 Nov 2009)

Log Message:
Replace filetypes.xml html_asp_default_language key with
filetypes.html asp.default.language property in [lexer_properties]

Modified Paths:

Modified: trunk/ChangeLog
--- trunk/ChangeLog	2009-11-18 16:48:17 UTC (rev 4432)
+++ trunk/ChangeLog	2009-11-18 17:07:12 UTC (rev 4433)
@@ -6,6 +6,10 @@
    data/filetypes.python, data/filetypes.conf:
    Use filetypes.foo [lexer_properties] group instead of hardcoding
    lexer properties (more flexible e.g. for custom filetypes).
+ * src/highlighting.c, data/filetypes.xml, data/filetypes.html:
+   Replace filetypes.xml html_asp_default_language key with
+   filetypes.html asp.default.language property in [lexer_properties]
+   group.
 2009-11-17  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/data/filetypes.html
--- trunk/data/filetypes.html	2009-11-18 16:48:17 UTC (rev 4432)
+++ trunk/data/filetypes.html	2009-11-18 17:07:12 UTC (rev 4433)
@@ -2,6 +2,12 @@
 # styling for PHP/HTML is done in filetypes.xml
+# default scripting language for ASP
+# 1 = JavaScript (or leave blank for default)
+# 2 = VBScript
+# 3 = Python
+# asp.default.language=2
 # default extension used when saving files

Modified: trunk/data/filetypes.xml
--- trunk/data/filetypes.xml	2009-11-18 16:48:17 UTC (rev 4432)
+++ trunk/data/filetypes.xml	2009-11-18 17:07:12 UTC (rev 4433)
@@ -71,13 +71,7 @@
 # for embedded Python script (<script language="python">...</script>), Python styles from
 # filetypes.python are used
-# default scripting language for ASP
-# 1 = JavaScript (or leave blank for default)
-# 2 = VBScript
-# 3 = Python
 html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml xml:lang
 javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with

Modified: trunk/src/highlighting.c
--- trunk/src/highlighting.c	2009-11-18 16:48:17 UTC (rev 4432)
+++ trunk/src/highlighting.c	2009-11-18 17:07:12 UTC (rev 4433)
@@ -1258,7 +1258,7 @@
 static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
-	new_styleset(GEANY_FILETYPES_XML, 57);
+	new_styleset(GEANY_FILETYPES_XML, 56);
 	get_keyfile_style(config, config_home, "html_default", &style_sets[GEANY_FILETYPES_XML].styling[0]);
 	get_keyfile_style(config, config_home, "html_tag", &style_sets[GEANY_FILETYPES_XML].styling[1]);
 	get_keyfile_style(config, config_home, "html_tagunknown", &style_sets[GEANY_FILETYPES_XML].styling[2]);
@@ -1319,8 +1319,6 @@
 	get_keyfile_style(config, config_home, "jscript_stringeol", &style_sets[GEANY_FILETYPES_XML].styling[54]);
 	get_keyfile_style(config, config_home, "jscript_regex", &style_sets[GEANY_FILETYPES_XML].styling[55]);
-	get_keyfile_int(config, config_home, "styling", "html_asp_default_language", 1, 0, &style_sets[GEANY_FILETYPES_XML].styling[56]);
 	style_sets[GEANY_FILETYPES_XML].keywords = g_new(gchar*, 7);
 	get_keyfile_keywords(config, config_home, "html", GEANY_FILETYPES_XML, 0);
 	get_keyfile_keywords(config, config_home, "javascript", GEANY_FILETYPES_XML, 1);
@@ -1484,18 +1482,9 @@
+	/* note: normally this would be in the filetype file instead */
 	sci_set_property(sci, "fold.html", "1");
 	sci_set_property(sci, "fold.html.preprocessor", "0");
-	{
-		gint asp_default_language;
-		gchar *str;
-		asp_default_language = style_sets[GEANY_FILETYPES_XML].styling[56].foreground;
-		str = g_strdup_printf("%d", asp_default_language);
-		sci_set_property(sci, "asp.default.language", &str[0]);
-		g_free(str);
-	}

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

More information about the Commits mailing list