SF.net SVN: geany:[3823] trunk/src/highlighting.c

Revision: 3823 http://geany.svn.sourceforge.net/geany/?rev=3823&view=rev Author: ntrel Date: 2009-05-29 12:54:56 +0000 (Fri, 29 May 2009)

Log Message: ----------- Remove get_keyfile_keywords() constant argument, rename index argument.

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

Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-05-28 20:22:12 UTC (rev 3822) +++ trunk/src/highlighting.c 2009-05-29 12:54:56 UTC (rev 3823) @@ -116,14 +116,15 @@ }

-static void get_keyfile_keywords(GKeyFile *config, GKeyFile *configh, const gchar *section, - const gchar *key, gint index, gint pos, const gchar *default_value) +static void get_keyfile_keywords(GKeyFile *config, GKeyFile *configh, + const gchar *key, gint ft_id, gint pos, const gchar *default_value) { + const gchar section[] = "keywords"; gchar *result;

- if (config == NULL || configh == NULL || section == NULL) + if (config == NULL || configh == NULL) { - style_sets[index].keywords[pos] = g_strdup(default_value); + style_sets[ft_id].keywords[pos] = g_strdup(default_value); return; }

@@ -133,11 +134,11 @@

if (result == NULL) { - style_sets[index].keywords[pos] = g_strdup(default_value); + style_sets[ft_id].keywords[pos] = g_strdup(default_value); } else { - style_sets[index].keywords[pos] = result; + style_sets[ft_id].keywords[pos] = result; } }

@@ -745,9 +746,9 @@ 1, 0, &style_sets[GEANY_FILETYPES_C].styling[20]);

style_sets[GEANY_FILETYPES_C].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_C, 0, "if const struct char int float double void long for while do case switch return"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_C, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_C, 2, "TODO FIXME"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_C, 0, "if const struct char int float double void long for while do case switch return"); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_C, 1, ""); + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_C, 2, "TODO FIXME"); style_sets[GEANY_FILETYPES_C].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -787,9 +788,9 @@ 1, 0, &style_sets[GEANY_FILETYPES_CPP].styling[20]);

style_sets[GEANY_FILETYPES_CPP].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CPP, 0, "and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CPP, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_CPP, 2, "TODO FIXME"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CPP, 0, "and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq"); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CPP, 1, ""); + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_CPP, 2, "TODO FIXME"); style_sets[GEANY_FILETYPES_CPP].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -830,7 +831,7 @@ 1, 0, &style_sets[GEANY_FILETYPES_GLSL].styling[20]);

style_sets[GEANY_FILETYPES_GLSL].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_GLSL, 0, + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_GLSL, 0, "if else switch case default for while do discard return break" "continue true false struct void bool int uint float vec2 vec3" "vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 uvec2 uvec3 uvec4 mat2" @@ -842,8 +843,8 @@ "usamplerCube usampler1DArray usampler2DArray const invariant" "centroid in out inout attribute uniform varying smooth flat" "noperspective highp mediump lowp"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_GLSL, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_GLSL, 2, "TODO FIXME"); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_GLSL, 1, ""); + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_GLSL, 2, "TODO FIXME"); style_sets[GEANY_FILETYPES_GLSL].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -883,7 +884,7 @@ 1, 0, &style_sets[GEANY_FILETYPES_CS].styling[20]);

style_sets[GEANY_FILETYPES_CS].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CS, 0, "\ + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CS, 0, "\ abstract as base bool break byte case catch char checked class \ const continue decimal default delegate do double else enum \ event explicit extern false finally fixed float for foreach goto if \ @@ -892,8 +893,8 @@ readonly ref return sbyte sealed short sizeof stackalloc static \ string struct switch this throw true try typeof uint ulong \ unchecked unsafe ushort using virtual void volatile while"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CS, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_CS, 2, ""); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CS, 1, ""); + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_CS, 2, ""); style_sets[GEANY_FILETYPES_CS].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -928,7 +929,7 @@ 1, 0, &style_sets[GEANY_FILETYPES_VALA].styling[20]);

style_sets[GEANY_FILETYPES_VALA].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_VALA, 0, + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_VALA, 0, "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 " @@ -952,8 +953,8 @@ * as simple types */ /*"constpointer time_t "*/ ); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_VALA, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_VALA, 2, ""); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_VALA, 1, ""); + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_VALA, 2, ""); style_sets[GEANY_FILETYPES_VALA].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1000,7 +1001,7 @@ get_keyfile_hex(config, config_home, "styling", "asm", "0x804080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PASCAL].styling[14]);

style_sets[GEANY_FILETYPES_PASCAL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PASCAL, 0, + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PASCAL, 0, "asm begin byte case char class do else end for function if implementation integer \ interface object procedure program real repeat string then to try unit until uses var word"); style_sets[GEANY_FILETYPES_PASCAL].keywords[1] = NULL; @@ -1121,7 +1122,7 @@ get_keyfile_hex(config, config_home, "styling", "comment", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LATEX].styling[4]);

style_sets[GEANY_FILETYPES_LATEX].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_LATEX, 0, "section subsection begin item"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_LATEX, 0, "section subsection begin item"); style_sets[GEANY_FILETYPES_LATEX].keywords[1] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1253,12 +1254,12 @@ get_keyfile_hex(config, config_home, "styling", "jscript_stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_XML].styling[54]);

style_sets[GEANY_FILETYPES_XML].keywords = g_new(gchar*, 7); - get_keyfile_keywords(config, config_home, "keywords", "html", GEANY_FILETYPES_XML, 0, "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"); - get_keyfile_keywords(config, config_home, "keywords", "javascript", GEANY_FILETYPES_XML, 1, "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"); - get_keyfile_keywords(config, config_home, "keywords", "vbscript", GEANY_FILETYPES_XML, 2, "and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant"); - get_keyfile_keywords(config, config_home, "keywords", "python", GEANY_FILETYPES_XML, 3, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); - get_keyfile_keywords(config, config_home, "keywords", "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor"); - get_keyfile_keywords(config, config_home, "keywords", "sgml", GEANY_FILETYPES_XML, 5, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); + get_keyfile_keywords(config, config_home, "html", GEANY_FILETYPES_XML, 0, "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"); + get_keyfile_keywords(config, config_home, "javascript", GEANY_FILETYPES_XML, 1, "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"); + get_keyfile_keywords(config, config_home, "vbscript", GEANY_FILETYPES_XML, 2, "and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant"); + get_keyfile_keywords(config, config_home, "python", GEANY_FILETYPES_XML, 3, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); + get_keyfile_keywords(config, config_home, "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor"); + get_keyfile_keywords(config, config_home, "sgml", GEANY_FILETYPES_XML, 5, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); style_sets[GEANY_FILETYPES_XML].keywords[6] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1427,16 +1428,16 @@ styleset_c_like_init(config, config_home, GEANY_FILETYPES_JAVA);

style_sets[GEANY_FILETYPES_JAVA].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_JAVA, 0, "\ + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_JAVA, 0, "\ abstract assert break case catch class \ const continue default do else extends final finally for future \ generic goto if implements import inner instanceof interface \ native new outer package private protected public rest \ return static super switch synchronized this throw throws \ transient try var volatile while true false null"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_JAVA, 1, "boolean byte char double float int long null short void"); - get_keyfile_keywords(config, config_home, "keywords", "doccomment", GEANY_FILETYPES_JAVA, 2, "return param author throws"); - get_keyfile_keywords(config, config_home, "keywords", "typedefs", GEANY_FILETYPES_JAVA, 3, ""); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_JAVA, 1, "boolean byte char double float int long null short void"); + get_keyfile_keywords(config, config_home, "doccomment", GEANY_FILETYPES_JAVA, 2, "return param author throws"); + get_keyfile_keywords(config, config_home, "typedefs", GEANY_FILETYPES_JAVA, 3, ""); style_sets[GEANY_FILETYPES_JAVA].keywords[4] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1500,7 +1501,7 @@

style_sets[GEANY_FILETYPES_PERL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PERL, 0, "\ + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PERL, 0, "\ NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD \ BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept \ alarm and atan2 bind binmode bless caller chdir chmod chomp chop \ @@ -1605,8 +1606,8 @@ get_keyfile_hex(config, config_home, "styling", "decorator", "0x808000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[15]);

style_sets[GEANY_FILETYPES_PYTHON].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PYTHON, 0, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); - get_keyfile_keywords(config, config_home, "keywords", "identifiers", GEANY_FILETYPES_PYTHON, 1, ""); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PYTHON, 0, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); + get_keyfile_keywords(config, config_home, "identifiers", GEANY_FILETYPES_PYTHON, 1, ""); style_sets[GEANY_FILETYPES_PYTHON].keywords[2] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1666,9 +1667,9 @@ get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CMAKE].styling[14]);

style_sets[GEANY_FILETYPES_CMAKE].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "commands", GEANY_FILETYPES_CMAKE, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "parameters", GEANY_FILETYPES_CMAKE, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "userdefined", GEANY_FILETYPES_CMAKE, 2, ""); + get_keyfile_keywords(config, config_home, "commands", GEANY_FILETYPES_CMAKE, 0, ""); + get_keyfile_keywords(config, config_home, "parameters", GEANY_FILETYPES_CMAKE, 1, ""); + get_keyfile_keywords(config, config_home, "userdefined", GEANY_FILETYPES_CMAKE, 2, ""); style_sets[GEANY_FILETYPES_CMAKE].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1723,9 +1724,9 @@ get_keyfile_hex(config, config_home, "styling", "infixeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_R].styling[11]);

style_sets[GEANY_FILETYPES_R].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_R, 0, "abs array data.frame diag for function if matrix NCOL NROW print read.table require return solve source sqrt sum while"); - get_keyfile_keywords(config, config_home, "keywords", "package", GEANY_FILETYPES_R, 1, NULL); - get_keyfile_keywords(config, config_home, "keywords", "package_other", GEANY_FILETYPES_R, 2, NULL); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_R, 0, "abs array data.frame diag for function if matrix NCOL NROW print read.table require return solve source sqrt sum while"); + get_keyfile_keywords(config, config_home, "package", GEANY_FILETYPES_R, 1, NULL); + get_keyfile_keywords(config, config_home, "package_other", GEANY_FILETYPES_R, 2, NULL); style_sets[GEANY_FILETYPES_R].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1799,7 +1800,7 @@ get_keyfile_hex(config, config_home, "styling", "pod", "0x035650", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[34]);

style_sets[GEANY_FILETYPES_RUBY].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield"); style_sets[GEANY_FILETYPES_RUBY].keywords[1] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1873,7 +1874,7 @@ get_keyfile_hex(config, config_home, "styling", "here_q", "0x7f007f", "0xddd0dd", "false", &style_sets[GEANY_FILETYPES_SH].styling[13]);

style_sets[GEANY_FILETYPES_SH].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then until while"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then until while"); style_sets[GEANY_FILETYPES_SH].keywords[1] = NULL;

get_keyfile_wordchars(config, config_home, @@ -1952,7 +1953,7 @@ get_keyfile_hex(config, config_home, "styling", "sgml_error", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_DOCBOOK].styling[28]);

style_sets[GEANY_FILETYPES_DOCBOOK].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "keywords", "elements", GEANY_FILETYPES_DOCBOOK, 0, + get_keyfile_keywords(config, config_home, "elements", GEANY_FILETYPES_DOCBOOK, 0, "abbrev abstract accel ackno acronym action address affiliation alt anchor \ answer appendix appendixinfo application area areaset areaspec arg article \ articleinfo artpagenums attribution audiodata audioobject author authorblurb \ @@ -2008,7 +2009,7 @@ videoobject void volumenum warning wordasword xref year cols colnum align spanname\ arch condition conformance id lang os remap role revision revisionflag security \ userlevel url vendor xreflabel status label endterm linkend space width"); - get_keyfile_keywords(config, config_home, "keywords", "dtd", GEANY_FILETYPES_DOCBOOK, 1, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); + get_keyfile_keywords(config, config_home, "dtd", GEANY_FILETYPES_DOCBOOK, 1, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); style_sets[GEANY_FILETYPES_DOCBOOK].keywords[2] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2106,14 +2107,14 @@ get_keyfile_hex(config, config_home, "styling", "extended_pseudoelement", "0x909080", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[21]);

style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 9); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CSS, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "pseudoclasses", GEANY_FILETYPES_CSS, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CSS, 2, ""); - get_keyfile_keywords(config, config_home, "keywords", "css3_properties", GEANY_FILETYPES_CSS, 3, ""); - get_keyfile_keywords(config, config_home, "keywords", "pseudo_elements", GEANY_FILETYPES_CSS, 4, ""); - get_keyfile_keywords(config, config_home, "keywords", "browser_css_properties", GEANY_FILETYPES_CSS, 5, ""); - get_keyfile_keywords(config, config_home, "keywords", "browser_pseudo_classes", GEANY_FILETYPES_CSS, 6, ""); - get_keyfile_keywords(config, config_home, "keywords", "browser_pseudo_elements", GEANY_FILETYPES_CSS, 7, ""); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CSS, 0, ""); + get_keyfile_keywords(config, config_home, "pseudoclasses", GEANY_FILETYPES_CSS, 1, ""); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CSS, 2, ""); + get_keyfile_keywords(config, config_home, "css3_properties", GEANY_FILETYPES_CSS, 3, ""); + get_keyfile_keywords(config, config_home, "pseudo_elements", GEANY_FILETYPES_CSS, 4, ""); + get_keyfile_keywords(config, config_home, "browser_css_properties", GEANY_FILETYPES_CSS, 5, ""); + get_keyfile_keywords(config, config_home, "browser_pseudo_classes", GEANY_FILETYPES_CSS, 6, ""); + get_keyfile_keywords(config, config_home, "browser_pseudo_elements", GEANY_FILETYPES_CSS, 7, ""); style_sets[GEANY_FILETYPES_CSS].keywords[8] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2183,10 +2184,10 @@ get_keyfile_hex(config, config_home, "styling", "commentbox", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_NSIS].styling[18]);

style_sets[GEANY_FILETYPES_NSIS].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "keywords", "functions", GEANY_FILETYPES_NSIS, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "variables", GEANY_FILETYPES_NSIS, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "lables", GEANY_FILETYPES_NSIS, 2, ""); - get_keyfile_keywords(config, config_home, "keywords", "userdefined", GEANY_FILETYPES_NSIS, 3, ""); + get_keyfile_keywords(config, config_home, "functions", GEANY_FILETYPES_NSIS, 0, ""); + get_keyfile_keywords(config, config_home, "variables", GEANY_FILETYPES_NSIS, 1, ""); + get_keyfile_keywords(config, config_home, "lables", GEANY_FILETYPES_NSIS, 2, ""); + get_keyfile_keywords(config, config_home, "userdefined", GEANY_FILETYPES_NSIS, 3, ""); style_sets[GEANY_FILETYPES_NSIS].keywords[4] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2325,9 +2326,9 @@ get_keyfile_hex(config, config_home, "styling", "extinstruction", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_ASM].styling[14]);

style_sets[GEANY_FILETYPES_ASM].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "instructions", GEANY_FILETYPES_ASM, 0, "HLT LAD SPI ADD SUB MUL DIV JMP JEZ JGZ JLZ SWAP JSR RET PUSHAC POPAC ADDST SUBST MULST DIVST LSA LDS PUSH POP CLI LDI INK LIA DEK LDX"); - get_keyfile_keywords(config, config_home, "keywords", "registers", GEANY_FILETYPES_ASM, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "directives", GEANY_FILETYPES_ASM, 2, "ORG LIST NOLIST PAGE EQUIVALENT WORD TEXT"); + get_keyfile_keywords(config, config_home, "instructions", GEANY_FILETYPES_ASM, 0, "HLT LAD SPI ADD SUB MUL DIV JMP JEZ JGZ JLZ SWAP JSR RET PUSHAC POPAC ADDST SUBST MULST DIVST LSA LDS PUSH POP CLI LDI INK LIA DEK LDX"); + get_keyfile_keywords(config, config_home, "registers", GEANY_FILETYPES_ASM, 1, ""); + get_keyfile_keywords(config, config_home, "directives", GEANY_FILETYPES_ASM, 2, "ORG LIST NOLIST PAGE EQUIVALENT WORD TEXT"); style_sets[GEANY_FILETYPES_ASM].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2386,9 +2387,9 @@ get_keyfile_hex(config, config_home, "styling", "label", "0xa861a8", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[14]);

style_sets[GEANY_FILETYPES_F77].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_F77, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "intrinsic_functions", GEANY_FILETYPES_F77, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "user_functions", GEANY_FILETYPES_F77, 2, ""); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_F77, 0, ""); + get_keyfile_keywords(config, config_home, "intrinsic_functions", GEANY_FILETYPES_F77, 1, ""); + get_keyfile_keywords(config, config_home, "user_functions", GEANY_FILETYPES_F77, 2, ""); style_sets[GEANY_FILETYPES_F77].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2445,9 +2446,9 @@ get_keyfile_hex(config, config_home, "styling", "label", "0xa861a8", "0xffffff", "true", &style_sets[GEANY_FILETYPES_FORTRAN].styling[14]);

style_sets[GEANY_FILETYPES_FORTRAN].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_FORTRAN, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "intrinsic_functions", GEANY_FILETYPES_FORTRAN, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "user_functions", GEANY_FILETYPES_FORTRAN, 2, ""); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_FORTRAN, 0, ""); + get_keyfile_keywords(config, config_home, "intrinsic_functions", GEANY_FILETYPES_FORTRAN, 1, ""); + get_keyfile_keywords(config, config_home, "user_functions", GEANY_FILETYPES_FORTRAN, 2, ""); style_sets[GEANY_FILETYPES_FORTRAN].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2504,7 +2505,7 @@ get_keyfile_hex(config, config_home, "styling", "quotedidentifier", "0x111199", "0xffffff", "false", &style_sets[GEANY_FILETYPES_SQL].styling[14]);

style_sets[GEANY_FILETYPES_SQL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_SQL, 0, + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_SQL, 0, "absolute action add admin after aggregate \ alias all allocate alter and any are array as asc \ assertion at authorization before begin bfile bigint binary bit blob bool boolean both breadth by \ @@ -2589,7 +2590,7 @@ get_keyfile_hex(config, config_home, "styling", "data", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[16]);

style_sets[GEANY_FILETYPES_HASKELL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_HASKELL, 0, + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_HASKELL, 0, "as case class data deriving do else if import in infixl infixr instance let module of primitive qualified then type where"); style_sets[GEANY_FILETYPES_HASKELL].keywords[1] = NULL;

@@ -2646,12 +2647,12 @@ get_keyfile_hex(config, config_home, "styling", "linenum", "0x000000", "0xc0c0c0", "false", &style_sets[GEANY_FILETYPES_CAML].styling[13]);

style_sets[GEANY_FILETYPES_CAML].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_CAML, 0, + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_CAML, 0, "and as assert asr begin class constraint do \ done downto else end exception external false for fun function functor if in include inherit \ initializer land lazy let lor lsl lsr lxor match method mod module mutable new object of open \ or private rec sig struct then to true try type val virtual when while with"); - get_keyfile_keywords(config, config_home, "keywords", "keywords_optional", GEANY_FILETYPES_CAML, 1, "option Some None ignore ref"); + get_keyfile_keywords(config, config_home, "keywords_optional", GEANY_FILETYPES_CAML, 1, "option Some None ignore ref"); style_sets[GEANY_FILETYPES_CAML].keywords[2] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2707,11 +2708,11 @@ get_keyfile_hex(config, config_home, "styling", "wordexpand", "0x7f0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_TCL].styling[15]);

style_sets[GEANY_FILETYPES_TCL].keywords = g_new(gchar*, 6); - get_keyfile_keywords(config, config_home, "keywords", "tcl", GEANY_FILETYPES_TCL, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "tk", GEANY_FILETYPES_TCL, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "itcl", GEANY_FILETYPES_TCL, 2, ""); - get_keyfile_keywords(config, config_home, "keywords", "tkcommands", GEANY_FILETYPES_TCL, 3, ""); - get_keyfile_keywords(config, config_home, "keywords", "expand", GEANY_FILETYPES_TCL, 4, ""); + get_keyfile_keywords(config, config_home, "tcl", GEANY_FILETYPES_TCL, 0, ""); + get_keyfile_keywords(config, config_home, "tk", GEANY_FILETYPES_TCL, 1, ""); + get_keyfile_keywords(config, config_home, "itcl", GEANY_FILETYPES_TCL, 2, ""); + get_keyfile_keywords(config, config_home, "tkcommands", GEANY_FILETYPES_TCL, 3, ""); + get_keyfile_keywords(config, config_home, "expand", GEANY_FILETYPES_TCL, 4, ""); style_sets[GEANY_FILETYPES_TCL].keywords[5] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2765,7 +2766,7 @@ get_keyfile_hex(config, config_home, "styling", "doublequotedstring", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[8]);

style_sets[GEANY_FILETYPES_MATLAB].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_MATLAB, 0, "break case catch continue else elseif end for function global if otherwise persistent return switch try while"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_MATLAB, 0, "break case catch continue else elseif end for function global if otherwise persistent return switch try while"); style_sets[GEANY_FILETYPES_MATLAB].keywords[1] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2820,7 +2821,7 @@ get_keyfile_hex(config, config_home, "styling", "commentdockeyworderror", "0x3f5fbf", "0xffffff", "false", &style_sets[GEANY_FILETYPES_D].styling[17]);

style_sets[GEANY_FILETYPES_D].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_D, 0, + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_D, 0, "__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto \ body bool break byte case cast catch cdouble cent cfloat char class const continue creal \ dchar debug default delegate delete deprecated do double else enum export extern false \ @@ -2829,12 +2830,12 @@ private protected public real return scope short static struct super switch \ synchronized template this throw true try typedef typeof ubyte ucent uint ulong union \ unittest ushort version void volatile wchar while with"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_D, 1, + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_D, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_D, 2, + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_D, 2, "Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns \ See_Also Standards Throws Version"); - get_keyfile_keywords(config, config_home, "keywords", "types", GEANY_FILETYPES_D, 3, + get_keyfile_keywords(config, config_home, "types", GEANY_FILETYPES_D, 3, ""); style_sets[GEANY_FILETYPES_D].keywords[4] = NULL;

@@ -2881,9 +2882,9 @@ styleset_c_like_init(config, config_home, GEANY_FILETYPES_FERITE);

style_sets[GEANY_FILETYPES_FERITE].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_FERITE, 0, "false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while"); - get_keyfile_keywords(config, config_home, "keywords", "types", GEANY_FILETYPES_FERITE, 1, "boolean string number array object void"); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_FERITE, 2, "brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_FERITE, 0, "false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while"); + get_keyfile_keywords(config, config_home, "types", GEANY_FILETYPES_FERITE, 1, "boolean string number array object void"); + get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_FERITE, 2, "brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning"); style_sets[GEANY_FILETYPES_FERITE].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, @@ -2926,7 +2927,7 @@ get_keyfile_hex(config, config_home, "styling", "userword", "0x804020", "0xffffff", "true", &style_sets[GEANY_FILETYPES_VHDL].styling[14]);

style_sets[GEANY_FILETYPES_VHDL].keywords = g_new(gchar*, 8); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_VHDL, 0, + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_VHDL, 0, "access after alias all architecture array assert attribute begin block \ body buffer bus case component configuration constant disconnect downto else elsif \ end entity exit file for function generate generic group guarded if impure in inertial \ @@ -2934,26 +2935,26 @@ package port postponed procedure process pure range record register reject report \ return select severity shared signal subtype then to transport type unaffected units \ until use variable wait when while with"); - get_keyfile_keywords(config, config_home, "keywords", "operators", GEANY_FILETYPES_VHDL, 1, + get_keyfile_keywords(config, config_home, "operators", GEANY_FILETYPES_VHDL, 1, "abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor"); - get_keyfile_keywords(config, config_home, "keywords", "attributes", GEANY_FILETYPES_VHDL, 2, + get_keyfile_keywords(config, config_home, "attributes", GEANY_FILETYPES_VHDL, 2, "left right low high ascending image value pos val succ pred leftof rightof base range \ reverse_range length delayed stable quiet transaction event active last_event last_active \ last_value driving driving_value simple_name path_name instance_name"); - get_keyfile_keywords(config, config_home, "keywords", "std_functions", GEANY_FILETYPES_VHDL, 3, + get_keyfile_keywords(config, config_home, "std_functions", GEANY_FILETYPES_VHDL, 3, "now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic \ to_stdlogicvector to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge \ is_x shift_left shift_right rotate_left rotate_right resize to_integer to_unsigned \ to_signed std_match to_01"); - get_keyfile_keywords(config, config_home, "keywords", "std_packages", GEANY_FILETYPES_VHDL, 4, + get_keyfile_keywords(config, config_home, "std_packages", GEANY_FILETYPES_VHDL, 4, "std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc \ std_logic_signed std_logic_textio std_logic_unsigned numeric_bit numeric_std \ math_complex math_real vital_primitives vital_timing"); - get_keyfile_keywords(config, config_home, "keywords", "std_types", GEANY_FILETYPES_VHDL, 5, + get_keyfile_keywords(config, config_home, "std_types", GEANY_FILETYPES_VHDL, 5, "boolean bit character severity_level integer real time delay_length natural positive \ string bit_vector file_open_kind file_open_status line text side width std_ulogic \ std_ulogic_vector std_logic std_logic_vector X01 X01Z UX01 UX01Z unsigned signed"); - get_keyfile_keywords(config, config_home, "keywords", "userwords", GEANY_FILETYPES_VHDL, 6, ""); + get_keyfile_keywords(config, config_home, "userwords", GEANY_FILETYPES_VHDL, 6, ""); style_sets[GEANY_FILETYPES_VHDL].keywords[7] = NULL;

get_keyfile_wordchars(config, config_home, @@ -3010,7 +3011,7 @@ get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_YAML].styling[9]);

style_sets[GEANY_FILETYPES_YAML].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_YAML, 0, "true false yes no"); + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_YAML, 0, "true false yes no"); style_sets[GEANY_FILETYPES_YAML].keywords[1] = NULL;

get_keyfile_wordchars(config, config_home, @@ -3046,7 +3047,7 @@ styleset_c_like_init(config, config_home, GEANY_FILETYPES_JS);

style_sets[GEANY_FILETYPES_JS].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_JS, 0, "\ + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_JS, 0, "\ 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 \ @@ -3104,10 +3105,10 @@ get_keyfile_hex(config, config_home, "styling", "word8", "0xff7600", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[19]);

style_sets[GEANY_FILETYPES_LUA].keywords = g_new(gchar*, 9); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_LUA, 0, + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_LUA, 0, "and break do else elseif end false for function if \ in local nil not or repeat return then true until while"); - get_keyfile_keywords(config, config_home, "keywords", "function_basic", GEANY_FILETYPES_LUA, 1, + get_keyfile_keywords(config, config_home, "function_basic", GEANY_FILETYPES_LUA, 1, "_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring \ print rawget rawset require tonumber tostring type unpack \ _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT \ @@ -3115,7 +3116,7 @@ sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall \ rawequal setfenv setmetatable xpcall string table math coroutine io os debug \ load module select"); - get_keyfile_keywords(config, config_home, "keywords", "function_other", GEANY_FILETYPES_LUA, 2, + get_keyfile_keywords(config, config_home, "function_other", GEANY_FILETYPES_LUA, 2, "abs acos asin atan atan2 ceil cos deg exp \ floor format frexp gsub ldexp log log10 max min mod rad random randomseed \ sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan \ @@ -3127,7 +3128,7 @@ math.pi math.pow math.rad math.random math.randomseed math.sin math.sqrt math.tan \ string.gmatch string.match string.reverse table.maxn \ math.cosh math.fmod math.modf math.sinh math.tanh math.huge"); - get_keyfile_keywords(config, config_home, "keywords", "coroutines", GEANY_FILETYPES_LUA, 3, + get_keyfile_keywords(config, config_home, "coroutines", GEANY_FILETYPES_LUA, 3, "openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname \ read write clock date difftime execute exit getenv setlocale time coroutine.create \ coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush \ @@ -3135,10 +3136,10 @@ io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv \ os.remove os.rename os.setlocale os.time os.tmpname coroutine.running package.cpath \ package.loaded package.loadlib package.path package.preload package.seeall io.popen"); - get_keyfile_keywords(config, config_home, "keywords", "user1", GEANY_FILETYPES_LUA, 4, ""); - get_keyfile_keywords(config, config_home, "keywords", "user2", GEANY_FILETYPES_LUA, 5, ""); - get_keyfile_keywords(config, config_home, "keywords", "user3", GEANY_FILETYPES_LUA, 6, ""); - get_keyfile_keywords(config, config_home, "keywords", "user4", GEANY_FILETYPES_LUA, 7, ""); + get_keyfile_keywords(config, config_home, "user1", GEANY_FILETYPES_LUA, 4, ""); + get_keyfile_keywords(config, config_home, "user2", GEANY_FILETYPES_LUA, 5, ""); + get_keyfile_keywords(config, config_home, "user3", GEANY_FILETYPES_LUA, 6, ""); + get_keyfile_keywords(config, config_home, "user4", GEANY_FILETYPES_LUA, 7, ""); style_sets[GEANY_FILETYPES_LUA].keywords[8] = NULL;

get_keyfile_wordchars(config, config_home, @@ -3210,7 +3211,7 @@ get_keyfile_hex(config, config_home, "styling", "binnumber", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[18]);

style_sets[GEANY_FILETYPES_BASIC].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_BASIC, 0, + get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_BASIC, 0, "as asm bit bitreset bitset byte case cint close cls color const \ continue cshort csign csng cubyte cuint culngint custom data \ dim do double else elseif end enum environ eof err error exec exit exp \ @@ -3221,11 +3222,11 @@ sizeof sleep space static step stop str string sub then time timer to type ubound \ ubyte ucase uinteger ulongint union unsigned until ushort using val val64 valint \ wait while with xor"); - get_keyfile_keywords(config, config_home, "keywords", "preprocessor", GEANY_FILETYPES_BASIC, 1, + get_keyfile_keywords(config, config_home, "preprocessor", GEANY_FILETYPES_BASIC, 1, "#define defined #dynamic #else #endif #endmacro #error #if #ifdef #ifndef #inclib #include \ #libpath #line #macro #print #undef"); - get_keyfile_keywords(config, config_home, "keywords", "user1", GEANY_FILETYPES_BASIC, 2, ""); - get_keyfile_keywords(config, config_home, "keywords", "user2", GEANY_FILETYPES_BASIC, 3, ""); + get_keyfile_keywords(config, config_home, "user1", GEANY_FILETYPES_BASIC, 2, ""); + get_keyfile_keywords(config, config_home, "user2", GEANY_FILETYPES_BASIC, 3, ""); style_sets[GEANY_FILETYPES_BASIC].keywords[4] = NULL;

get_keyfile_wordchars(config, config_home, @@ -3274,9 +3275,9 @@

style_sets[GEANY_FILETYPES_AS].keywords = g_new(gchar *, 4);

- get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_AS, 0, ""); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_AS, 1, ""); - get_keyfile_keywords(config, config_home, "keywords", "classes", GEANY_FILETYPES_AS, 2, ""); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_AS, 0, ""); + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_AS, 1, ""); + get_keyfile_keywords(config, config_home, "classes", GEANY_FILETYPES_AS, 2, ""); style_sets[GEANY_FILETYPES_AS].keywords[3] = NULL;

get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_AS].wordchars); @@ -3302,7 +3303,7 @@

style_sets[GEANY_FILETYPES_HAXE].keywords = g_new(gchar*, 4);

- get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_HAXE, 0, "\ + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_HAXE, 0, "\ abstract break case catch class \ continue default do else enum external extends \ finally float for function goto if implements import in \ @@ -3310,10 +3311,10 @@ return static super switch this throw throws \ try type var while");

- get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_HAXE, 1, "\ + get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_HAXE, 1, "\ Bool Enum Float Int Null Void Dynamic String");

- get_keyfile_keywords(config, config_home, "keywords", "classes", GEANY_FILETYPES_HAXE, 2, "\ + get_keyfile_keywords(config, config_home, "classes", GEANY_FILETYPES_HAXE, 2, "\ Array ArrayAccess Class Date DateTools \ EReg Enum Hash IntHash IntIter \ Iterable Iterator Lambda List Math Protected \ @@ -3358,7 +3359,7 @@ get_keyfile_hex(config, config_home, "styling", "illegal", "0xff0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_ADA].styling[11]);

style_sets[GEANY_FILETYPES_ADA].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_ADA, 0, "abort abs abstract accept access aliased all and array at begin body case constant declare delay delta digits do else elsif end entry exception exit for function generic goto if in interface is limited loop mod new not null of or others out overriding package pragma private procedure protected raise range record rem renames requeue return reverse select separate subtype synchronized tagged task terminate then type until use when while with xor"); + get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_ADA, 0, "abort abs abstract accept access aliased all and array at begin body case constant declare delay delta digits do else elsif end entry exception exit for function generic goto if in interface is limited loop mod new not null of or others out overriding package pragma private procedure protected raise range record rem renames requeue return reverse select separate subtype synchronized tagged task terminate then type until use when while with xor"); style_sets[GEANY_FILETYPES_ADA].keywords[1] = NULL;

get_keyfile_wordchars(config, config_home,

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