Commits October 2010

commits@lists.geany.org

5 participants
87 discussions

SF.net SVN: geany:[5315] trunk/src/prefs.c
by ntrel＠users.sourceforge.net 21 Oct '10

21 Oct '10

Revision: 5315 http://geany.svn.sourceforge.net/geany/?rev=5315&view=rev Author: ntrel Date: 2010-10-21 16:19:06 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Rename confusing callback name for prefs dialog response. Edit comment - use Stash for new 'simple' prefs. Modified Paths: -------------- trunk/src/prefs.c Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2010-10-21 16:06:53 UTC (rev 5314) +++ trunk/src/prefs.c 2010-10-21 16:19:06 UTC (rev 5315) @@ -28,7 +28,7 @@ /* * Preferences dialog support functions. - * New prefs should use Stash code in keyfile.c - init_pref_groups(). + * New 'simple' prefs should use Stash code in keyfile.c - init_pref_groups(). */ #include <stdlib.h> @@ -324,7 +324,7 @@ } -/* note: new prefs should use Stash code in keyfile.c */ +/* note: new 'simple' prefs should use Stash code in keyfile.c */ static void prefs_init_dialog(void) { GtkWidget *widget; @@ -744,9 +744,9 @@ /* * callbacks */ -/* note: new prefs should use Stash code in keyfile.c */ +/* note: new 'simple' prefs should use Stash code in keyfile.c */ static void -on_prefs_button_clicked(GtkDialog *dialog, gint response, gpointer user_data) +on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { @@ -1670,7 +1670,7 @@ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "extra_plugin_path_entry"))); g_signal_connect(ui_widgets.prefs_dialog, "response", - G_CALLBACK(on_prefs_button_clicked), NULL); + G_CALLBACK(on_prefs_dialog_response), NULL); g_signal_connect(ui_widgets.prefs_dialog, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5314] trunk/src/prefs.c
by ntrel＠users.sourceforge.net 21 Oct '10

21 Oct '10

Revision: 5314 http://geany.svn.sourceforge.net/geany/?rev=5314&view=rev Author: ntrel Date: 2010-10-21 16:06:53 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Rename confusing Grab Key dialog callback functions. Modified Paths: -------------- trunk/src/prefs.c Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2010-10-21 15:59:06 UTC (rev 5313) +++ trunk/src/prefs.c 2010-10-21 16:06:53 UTC (rev 5314) @@ -80,8 +80,8 @@ static gboolean edited = FALSE; static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data); -static gboolean kb_keytype_dialog_response_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data); -static void kb_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data); +static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data); +static void kb_grab_key_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data); static gboolean kb_find_duplicate(GtkWidget *parent, GeanyKeyBinding *search_kb, guint key, GdkModifierType mods, const gchar *action); static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -176,8 +176,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), dialog_label); g_signal_connect(dialog, "key-press-event", - G_CALLBACK(kb_keytype_dialog_response_cb), NULL); - g_signal_connect(dialog, "response", G_CALLBACK(kb_dialog_response_cb), NULL); + G_CALLBACK(kb_grab_key_dialog_key_press_cb), NULL); + g_signal_connect(dialog, "response", G_CALLBACK(kb_grab_key_dialog_response_cb), NULL); gtk_widget_show_all(dialog); g_free(str); @@ -1279,7 +1279,7 @@ } -static gboolean kb_keytype_dialog_response_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data) +static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data) { gchar *str; gint state; @@ -1298,7 +1298,7 @@ } -static void kb_dialog_response_cb(GtkWidget *dialog, gint response, G_GNUC_UNUSED gpointer iter) +static void kb_grab_key_dialog_response_cb(GtkWidget *dialog, gint response, G_GNUC_UNUSED gpointer iter) { if (response == GTK_RESPONSE_ACCEPT) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5313] trunk
by ntrel＠users.sourceforge.net 21 Oct '10

21 Oct '10

Revision: 5313 http://geany.svn.sourceforge.net/geany/?rev=5313&view=rev Author: ntrel Date: 2010-10-21 15:59:06 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Allow 'Foo=' in filetype_extensions.conf to remove all patterns. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-21 15:41:24 UTC (rev 5312) +++ trunk/ChangeLog 2010-10-21 15:59:06 UTC (rev 5313) @@ -2,6 +2,8 @@ * src/utils.c, src/filetypes.c: Remove filetype default extensions from code. + * src/filetypes.c: + Allow 'Foo=' in filetype_extensions.conf to remove all patterns. 2010-10-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-21 15:41:24 UTC (rev 5312) +++ trunk/src/filetypes.c 2010-10-21 15:59:06 UTC (rev 5313) @@ -1392,16 +1392,15 @@ gchar **list = g_key_file_get_string_list( (userset) ? userconfig : sysconfig, "Extensions", filetypes[i]->name, &len, NULL); - if (G_LIKELY(list) && G_LIKELY(len > 0)) - { - g_strfreev(filetypes[i]->pattern); - filetypes[i]->pattern = list; + g_strfreev(filetypes[i]->pattern); + /* Note: we allow 'Foo=' to remove all patterns */ + if (!list) + list = g_new0(gchar*, 1); + filetypes[i]->pattern = list; + #ifdef G_OS_WIN32 - convert_filetype_extensions_to_lower_case(filetypes[i]->pattern, len); + convert_filetype_extensions_to_lower_case(filetypes[i]->pattern, len); #endif - } - else - g_strfreev(list); } g_free(sysconfigfile); @@ -1409,6 +1408,7 @@ g_key_file_free(sysconfig); g_key_file_free(userconfig); + /* Redetect filetype of any documents with none set */ foreach_document(i) { GeanyDocument *doc = documents[i]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5312] trunk
by ntrel＠users.sourceforge.net 21 Oct '10

21 Oct '10

Revision: 5312 http://geany.svn.sourceforge.net/geany/?rev=5312&view=rev Author: ntrel Date: 2010-10-21 15:41:24 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Remove filetype default extensions from code. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-20 16:28:06 UTC (rev 5311) +++ trunk/ChangeLog 2010-10-21 15:41:24 UTC (rev 5312) @@ -1,3 +1,9 @@ +2010-10-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/filetypes.c: + Remove filetype default extensions from code. + + 2010-10-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/highlighting.c: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-20 16:28:06 UTC (rev 5311) +++ trunk/src/filetypes.c 2010-10-21 15:41:24 UTC (rev 5312) @@ -95,7 +95,6 @@ ft = filetypes[GEANY_FILETYPES_NONE]; ft->name = g_strdup(_("None")); ft->title = g_strdup(_("None")); - ft->pattern = utils_strv_new("*", NULL); ft->group = GEANY_FILETYPE_GROUP_NONE; #define C @@ -103,7 +102,6 @@ ft->lang = 0; ft->name = g_strdup("C"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.c", "*.h", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CPP @@ -111,8 +109,6 @@ ft->lang = 1; ft->name = g_strdup("C++"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.cpp", "*.cxx", "*.c++", "*.cc", - "*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", "*.C", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CS @@ -120,7 +116,6 @@ ft->lang = 25; ft->name = g_strdup("C#"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.cs", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define VALA @@ -128,7 +123,6 @@ ft->lang = 33; ft->name = g_strdup("Vala"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.vala", "*.vapi", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define D @@ -136,7 +130,6 @@ ft->lang = 17; ft->name = g_strdup("D"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.d", "*.di", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define JAVA @@ -144,7 +137,6 @@ ft->lang = 2; ft->name = g_strdup("Java"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.java", "*.jsp", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define PAS /* to avoid warnings when building under Windows, the symbol PASCAL is there defined */ @@ -152,8 +144,6 @@ ft->lang = 4; ft->name = g_strdup("Pascal"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.pas", "*.pp", "*.inc", "*.dpr", - "*.dpk", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define ASM @@ -161,7 +151,6 @@ ft->lang = 9; ft->name = g_strdup("ASM"); ft->title = g_strdup_printf(_("%s source file"), "Assembler"); - ft->pattern = utils_strv_new("*.asm", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define BASIC @@ -169,7 +158,6 @@ ft->lang = 26; ft->name = g_strdup("FreeBasic"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.bas", "*.bi", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define FORTRAN @@ -177,7 +165,6 @@ ft->lang = 18; ft->name = g_strdup("Fortran"); ft->title = g_strdup_printf(_("%s source file"), "Fortran (F90)"); - ft->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define F77 @@ -185,7 +172,6 @@ ft->lang = 30; ft->name = g_strdup("F77"); ft->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); - ft->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define GLSL @@ -193,14 +179,12 @@ ft->lang = 31; ft->name = g_strdup("GLSL"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.glsl", "*.frag", "*.vert", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CAML ft = filetypes[GEANY_FILETYPES_CAML]; ft->name = g_strdup("CAML"); ft->title = g_strdup_printf(_("%s source file"), "(O)Caml"); - ft->pattern = utils_strv_new("*.ml", "*.mli", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define PERL @@ -208,8 +192,6 @@ ft->lang = 5; ft->name = g_strdup("Perl"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.pl", "*.perl", "*.pm", "*.agi", - "*.pod", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define PHP @@ -217,8 +199,6 @@ ft->lang = 6; ft->name = g_strdup("PHP"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.php", "*.php3", "*.php4", "*.php5", - "*.phtml", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define JAVASCRIPT @@ -226,7 +206,6 @@ ft->lang = 23; ft->name = g_strdup("Javascript"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.js", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define PYTHON @@ -234,7 +213,6 @@ ft->lang = 7; ft->name = g_strdup("Python"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.py", "*.pyw", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define RUBY @@ -242,7 +220,6 @@ ft->lang = 14; ft->name = g_strdup("Ruby"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.rb", "*.rhtml", "*.ruby", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define TCL @@ -250,7 +227,6 @@ ft->lang = 15; ft->name = g_strdup("Tcl"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.tcl", "*.tk", "*.wish", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define LUA @@ -258,7 +234,6 @@ ft->lang = 22; ft->name = g_strdup("Lua"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.lua", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define FERITE @@ -266,7 +241,6 @@ ft->lang = 19; ft->name = g_strdup("Ferite"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.fe", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define HASKELL @@ -274,7 +248,6 @@ ft->lang = 24; ft->name = g_strdup("Haskell"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.hs", "*.lhs", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define MARKDOWN @@ -282,7 +255,6 @@ ft->lang = 36; ft->name = g_strdup("Markdown"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.mdml", "*.mdwn", "*.markdown", "*.md", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define TXT2TAGS @@ -290,7 +262,6 @@ ft->lang = 37; ft->name = g_strdup("Txt2tags"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.t2t", "*.txt2tags", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define ABC @@ -298,7 +269,6 @@ ft->lang = 38; ft->name = g_strdup("Abc"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.abc", "*.abp", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define SH @@ -306,8 +276,6 @@ ft->lang = 16; ft->name = g_strdup("Sh"); ft->title = g_strdup(_("Shell script file")); - ft->pattern = utils_strv_new("*.sh", "configure", "configure.in", - "configure.in.in", "configure.ac", "*.ksh", "*.zsh", "*.ash", "*.bash", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define MAKE @@ -315,16 +283,12 @@ ft->lang = 3; ft->name = g_strdup("Make"); ft->title = g_strdup(_("Makefile")); - ft->pattern = utils_strv_new( - "*.mak", "*.mk", "GNUmakefile", "makefile", "Makefile", "makefile.*", "Makefile.*", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define XML ft = filetypes[GEANY_FILETYPES_XML]; ft->name = g_strdup("XML"); ft->title = g_strdup(_("XML document")); - ft->pattern = utils_strv_new( - "*.xml", "*.sgml", "*.xsl", "*.xslt", "*.xsd", "*.xhtml", NULL); ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define DOCBOOK @@ -332,7 +296,6 @@ ft->lang = 12; ft->name = g_strdup("Docbook"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.docbook", NULL); ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define HTML @@ -340,8 +303,6 @@ ft->lang = 29; ft->name = g_strdup("HTML"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new( - "*.htm", "*.html", "*.shtml", "*.hta", "*.htd", "*.htt", "*.cfm", NULL); ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define CSS @@ -349,7 +310,6 @@ ft->lang = 13; ft->name = g_strdup("CSS"); ft->title = g_strdup(_("Cascading StyleSheet")); - ft->pattern = utils_strv_new("*.css", NULL); ft->group = GEANY_FILETYPE_GROUP_MARKUP; /* not really markup but fit quite well to HTML */ #define SQL @@ -357,7 +317,6 @@ ft->lang = 11; ft->name = g_strdup("SQL"); ft->title = g_strdup(_("SQL Dump file")); - ft->pattern = utils_strv_new("*.sql", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define LATEX @@ -365,7 +324,6 @@ ft->lang = 8; ft->name = g_strdup("LaTeX"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.tex", "*.sty", "*.idx", "*.ltx", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define VHDL @@ -373,7 +331,6 @@ ft->lang = 21; ft->name = g_strdup("VHDL"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.vhd", "*.vhdl", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define VERILOG @@ -381,7 +338,6 @@ ft->lang = 39; ft->name = g_strdup("Verilog"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.v", "*.verilog", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define DIFF @@ -389,21 +345,18 @@ ft->lang = 20; ft->name = g_strdup("Diff"); filetype_make_title(ft, TITLE_FILE); - ft->pattern = utils_strv_new("*.diff", "*.patch", "*.rej", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define LISP ft = filetypes[GEANY_FILETYPES_LISP]; ft->name = g_strdup("Lisp"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.lisp", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define ERLANG ft = filetypes[GEANY_FILETYPES_ERLANG]; ft->name = g_strdup("Erlang"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.erl", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define CONF @@ -411,15 +364,12 @@ ft->lang = 10; ft->name = g_strdup("Conf"); ft->title = g_strdup(_("Config file")); - ft->pattern = utils_strv_new("*.conf", "*.ini", "config", "*rc", - "*.cfg", "*.desktop", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define PO ft = filetypes[GEANY_FILETYPES_PO]; ft->name = g_strdup("Po"); ft->title = g_strdup(_("Gettext translation file")); - ft->pattern = utils_strv_new("*.po", "*.pot", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define HAXE @@ -427,7 +377,6 @@ ft->lang = 27; ft->name = g_strdup("Haxe"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.hx", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define ACTIONSCRIPT @@ -435,7 +384,6 @@ ft->lang = 34; ft->name = g_strdup("ActionScript"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.as", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define R @@ -443,7 +391,6 @@ ft->lang = 40; ft->name = g_strdup("R"); ft->title = g_strdup_printf(_("%s script file"), "R"); - ft->pattern = utils_strv_new("*.R", "*.r", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define REST @@ -451,8 +398,6 @@ ft->lang = 28; ft->name = g_strdup("reStructuredText"); filetype_make_title(ft, TITLE_FILE); - ft->pattern = utils_strv_new( - "*.rest", "*.reST", "*.rst", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define MATLAB @@ -460,21 +405,18 @@ ft->lang = 32; ft->name = g_strdup("Matlab/Octave"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.m", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define YAML ft = filetypes[GEANY_FILETYPES_YAML]; ft->name = g_strdup("YAML"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.yaml", "*.yml", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define CMAKE ft = filetypes[GEANY_FILETYPES_CMAKE]; ft->name = g_strdup("CMake"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("CMakeLists.txt", "*.cmake", "*.ctest", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define NSIS @@ -482,21 +424,18 @@ ft->lang = 35; ft->name = g_strdup("NSIS"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.nsi", "*.nsh", NULL); ft->group = GEANY_FILETYPE_GROUP_MISC; #define ADA ft = filetypes[GEANY_FILETYPES_ADA]; ft->name = g_strdup("Ada"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.adb", "*.ads", NULL); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define FORTH ft = filetypes[GEANY_FILETYPES_FORTH]; ft->name = g_strdup("Forth"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->pattern = utils_strv_new("*.fs", "*.fth", NULL); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; } @@ -507,6 +446,8 @@ GeanyFiletype *ft = g_new0(GeanyFiletype, 1); ft->lang = -2; /* assume no tagmanager parser */ + /* pattern must not be null */ + ft->pattern = g_new0(gchar*, 1); ft->project_list_entry = -1; /* no entry */ ft->priv = g_new0(GeanyFiletypePrivate, 1); @@ -558,7 +499,6 @@ ft = filetype_new(); ft->name = g_strdup(fn); filetype_make_title(ft, TITLE_FILE); - ft->pattern = g_new0(gchar*, 1); ft->group = GEANY_FILETYPE_GROUP_CUSTOM; ft->priv->custom = TRUE; filetype_add(ft); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2010-10-20 16:28:06 UTC (rev 5311) +++ trunk/src/utils.c 2010-10-21 15:41:24 UTC (rev 5312) @@ -1329,6 +1329,8 @@ } +/* currently unused */ +#if 0 /* Creates a string array deep copy of a series of non-NULL strings. * The first argument is nothing special. * The list must be ended with NULL. @@ -1362,6 +1364,7 @@ strv[i] = NULL; return strv; } +#endif /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5311] trunk/src/filetypes.c
by ntrel＠users.sourceforge.net 20 Oct '10

20 Oct '10

Revision: 5311 http://geany.svn.sourceforge.net/geany/?rev=5311&view=rev Author: ntrel Date: 2010-10-20 16:28:06 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Don't write 'ft->lang = -2' for filetypes with no tag parser; this is the default anyway. Modified Paths: -------------- trunk/src/filetypes.c Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-20 16:22:58 UTC (rev 5310) +++ trunk/src/filetypes.c 2010-10-20 16:28:06 UTC (rev 5311) @@ -93,7 +93,6 @@ #define NONE /* these macros are only to ease navigation */ ft = filetypes[GEANY_FILETYPES_NONE]; - ft->lang = -2; ft->name = g_strdup(_("None")); ft->title = g_strdup(_("None")); ft->pattern = utils_strv_new("*", NULL); @@ -199,7 +198,6 @@ #define CAML ft = filetypes[GEANY_FILETYPES_CAML]; - ft->lang = -2; ft->name = g_strdup("CAML"); ft->title = g_strdup_printf(_("%s source file"), "(O)Caml"); ft->pattern = utils_strv_new("*.ml", "*.mli", NULL); @@ -323,7 +321,6 @@ #define XML ft = filetypes[GEANY_FILETYPES_XML]; - ft->lang = -2; ft->name = g_strdup("XML"); ft->title = g_strdup(_("XML document")); ft->pattern = utils_strv_new( @@ -397,7 +394,6 @@ #define LISP ft = filetypes[GEANY_FILETYPES_LISP]; - ft->lang = -2; ft->name = g_strdup("Lisp"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.lisp", NULL); @@ -405,7 +401,6 @@ #define ERLANG ft = filetypes[GEANY_FILETYPES_ERLANG]; - ft->lang = -2; ft->name = g_strdup("Erlang"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.erl", NULL); @@ -422,7 +417,6 @@ #define PO ft = filetypes[GEANY_FILETYPES_PO]; - ft->lang = -2; ft->name = g_strdup("Po"); ft->title = g_strdup(_("Gettext translation file")); ft->pattern = utils_strv_new("*.po", "*.pot", NULL); @@ -471,7 +465,6 @@ #define YAML ft = filetypes[GEANY_FILETYPES_YAML]; - ft->lang = -2; ft->name = g_strdup("YAML"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.yaml", "*.yml", NULL); @@ -479,7 +472,6 @@ #define CMAKE ft = filetypes[GEANY_FILETYPES_CMAKE]; - ft->lang = -2; ft->name = g_strdup("CMake"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("CMakeLists.txt", "*.cmake", "*.ctest", NULL); @@ -495,7 +487,6 @@ #define ADA ft = filetypes[GEANY_FILETYPES_ADA]; - ft->lang = -2; ft->name = g_strdup("Ada"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.adb", "*.ads", NULL); @@ -503,7 +494,6 @@ #define FORTH ft = filetypes[GEANY_FILETYPES_FORTH]; - ft->lang = -2; ft->name = g_strdup("Forth"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.fs", "*.fth", NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5310] trunk
by ntrel＠users.sourceforge.net 20 Oct '10

20 Oct '10

Revision: 5310 http://geany.svn.sourceforge.net/geany/?rev=5310&view=rev Author: ntrel Date: 2010-10-20 16:22:58 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Move filetype comment_{open,close} defaults into data files. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.vala trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-20 16:15:39 UTC (rev 5309) +++ trunk/ChangeLog 2010-10-20 16:22:58 UTC (rev 5310) @@ -12,6 +12,8 @@ Add Erlang filetype (patch by Taylor Venable, thanks). * src/filetypes.c, data/filetypes.*: Move filetype 'extension' default into data files. + * src/filetypes.c, data/filetypes.vala: + Move filetype comment_{open,close} defaults into data files. 2010-10-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/data/filetypes.vala =================================================================== --- trunk/data/filetypes.vala 2010-10-20 16:15:39 UTC (rev 5309) +++ trunk/data/filetypes.vala 2010-10-20 16:22:58 UTC (rev 5310) @@ -48,8 +48,8 @@ #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank -#comment_open=// -#comment_close= +comment_open=// +comment_close= # this is an alternative way, so multiline comments are used #comment_open=/* #comment_close=*/ Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-20 16:15:39 UTC (rev 5309) +++ trunk/src/filetypes.c 2010-10-20 16:22:58 UTC (rev 5310) @@ -97,8 +97,6 @@ ft->name = g_strdup(_("None")); ft->title = g_strdup(_("None")); ft->pattern = utils_strv_new("*", NULL); - ft->comment_open = NULL; - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_NONE; #define C @@ -107,8 +105,6 @@ ft->name = g_strdup("C"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.c", "*.h", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CPP @@ -118,8 +114,6 @@ filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.cpp", "*.cxx", "*.c++", "*.cc", "*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", "*.C", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CS @@ -128,8 +122,6 @@ ft->name = g_strdup("C#"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.cs", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define VALA @@ -138,8 +130,6 @@ ft->name = g_strdup("Vala"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.vala", "*.vapi", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define D @@ -148,8 +138,6 @@ ft->name = g_strdup("D"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.d", "*.di", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define JAVA @@ -158,8 +146,6 @@ ft->name = g_strdup("Java"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.java", "*.jsp", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define PAS /* to avoid warnings when building under Windows, the symbol PASCAL is there defined */ @@ -169,8 +155,6 @@ filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.pas", "*.pp", "*.inc", "*.dpr", "*.dpk", NULL); - ft->comment_open = g_strdup("{"); - ft->comment_close = g_strdup("}"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define ASM @@ -179,8 +163,6 @@ ft->name = g_strdup("ASM"); ft->title = g_strdup_printf(_("%s source file"), "Assembler"); ft->pattern = utils_strv_new("*.asm", NULL); - ft->comment_open = g_strdup(";"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define BASIC @@ -189,8 +171,6 @@ ft->name = g_strdup("FreeBasic"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.bas", "*.bi", NULL); - ft->comment_open = g_strdup("'"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define FORTRAN @@ -199,8 +179,6 @@ ft->name = g_strdup("Fortran"); ft->title = g_strdup_printf(_("%s source file"), "Fortran (F90)"); ft->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL); - ft->comment_open = g_strdup("!"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define F77 @@ -209,8 +187,6 @@ ft->name = g_strdup("F77"); ft->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); ft->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", NULL); - ft->comment_open = g_strdup("c"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define GLSL @@ -219,8 +195,6 @@ ft->name = g_strdup("GLSL"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.glsl", "*.frag", "*.vert", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CAML @@ -229,8 +203,6 @@ ft->name = g_strdup("CAML"); ft->title = g_strdup_printf(_("%s source file"), "(O)Caml"); ft->pattern = utils_strv_new("*.ml", "*.mli", NULL); - ft->comment_open = g_strdup("(*"); - ft->comment_close = g_strdup("*)"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define PERL @@ -240,8 +212,6 @@ filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.pl", "*.perl", "*.pm", "*.agi", "*.pod", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define PHP @@ -251,8 +221,6 @@ filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.php", "*.php3", "*.php4", "*.php5", "*.phtml", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define JAVASCRIPT @@ -261,8 +229,6 @@ ft->name = g_strdup("Javascript"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.js", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define PYTHON @@ -271,8 +237,6 @@ ft->name = g_strdup("Python"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.py", "*.pyw", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define RUBY @@ -281,8 +245,6 @@ ft->name = g_strdup("Ruby"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.rb", "*.rhtml", "*.ruby", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define TCL @@ -291,8 +253,6 @@ ft->name = g_strdup("Tcl"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.tcl", "*.tk", "*.wish", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define LUA @@ -301,8 +261,6 @@ ft->name = g_strdup("Lua"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.lua", NULL); - ft->comment_open = g_strdup("--"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define FERITE @@ -311,8 +269,6 @@ ft->name = g_strdup("Ferite"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.fe", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define HASKELL @@ -321,8 +277,6 @@ ft->name = g_strdup("Haskell"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.hs", "*.lhs", NULL); - ft->comment_open = g_strdup("--"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define MARKDOWN @@ -331,8 +285,6 @@ ft->name = g_strdup("Markdown"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.mdml", "*.mdwn", "*.markdown", "*.md", NULL); - ft->comment_open = NULL; - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define TXT2TAGS @@ -341,8 +293,6 @@ ft->name = g_strdup("Txt2tags"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.t2t", "*.txt2tags", NULL); - ft->comment_open = NULL; - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define ABC @@ -351,8 +301,6 @@ ft->name = g_strdup("Abc"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.abc", "*.abp", NULL); - ft->comment_open = NULL; - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define SH @@ -362,8 +310,6 @@ ft->title = g_strdup(_("Shell script file")); ft->pattern = utils_strv_new("*.sh", "configure", "configure.in", "configure.in.in", "configure.ac", "*.ksh", "*.zsh", "*.ash", "*.bash", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define MAKE @@ -373,8 +319,6 @@ ft->title = g_strdup(_("Makefile")); ft->pattern = utils_strv_new( "*.mak", "*.mk", "GNUmakefile", "makefile", "Makefile", "makefile.*", "Makefile.*", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define XML @@ -384,8 +328,6 @@ ft->title = g_strdup(_("XML document")); ft->pattern = utils_strv_new( "*.xml", "*.sgml", "*.xsl", "*.xslt", "*.xsd", "*.xhtml", NULL); - ft->comment_open = g_strdup(""); ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define DOCBOOK @@ -394,8 +336,6 @@ ft->name = g_strdup("Docbook"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.docbook", NULL); - ft->comment_open = g_strdup(""); ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define HTML @@ -405,8 +345,6 @@ filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new( "*.htm", "*.html", "*.shtml", "*.hta", "*.htd", "*.htt", "*.cfm", NULL); - ft->comment_open = g_strdup(""); ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define CSS @@ -415,8 +353,6 @@ ft->name = g_strdup("CSS"); ft->title = g_strdup(_("Cascading StyleSheet")); ft->pattern = utils_strv_new("*.css", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_MARKUP; /* not really markup but fit quite well to HTML */ #define SQL @@ -425,8 +361,6 @@ ft->name = g_strdup("SQL"); ft->title = g_strdup(_("SQL Dump file")); ft->pattern = utils_strv_new("*.sql", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_MISC; #define LATEX @@ -435,8 +369,6 @@ ft->name = g_strdup("LaTeX"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.tex", "*.sty", "*.idx", "*.ltx", NULL); - ft->comment_open = g_strdup("%"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define VHDL @@ -445,8 +377,6 @@ ft->name = g_strdup("VHDL"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.vhd", "*.vhdl", NULL); - ft->comment_open = g_strdup("--"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define VERILOG @@ -455,8 +385,6 @@ ft->name = g_strdup("Verilog"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.v", "*.verilog", NULL); - ft->comment_open = g_strdup("/*"); - ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define DIFF @@ -465,8 +393,6 @@ ft->name = g_strdup("Diff"); filetype_make_title(ft, TITLE_FILE); ft->pattern = utils_strv_new("*.diff", "*.patch", "*.rej", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define LISP @@ -475,8 +401,6 @@ ft->name = g_strdup("Lisp"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.lisp", NULL); - ft->comment_open = g_strdup(";"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define ERLANG @@ -485,8 +409,6 @@ ft->name = g_strdup("Erlang"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.erl", NULL); - ft->comment_open = g_strdup("%"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define CONF @@ -496,8 +418,6 @@ ft->title = g_strdup(_("Config file")); ft->pattern = utils_strv_new("*.conf", "*.ini", "config", "*rc", "*.cfg", "*.desktop", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define PO @@ -506,8 +426,6 @@ ft->name = g_strdup("Po"); ft->title = g_strdup(_("Gettext translation file")); ft->pattern = utils_strv_new("*.po", "*.pot", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define HAXE @@ -516,8 +434,6 @@ ft->name = g_strdup("Haxe"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.hx", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define ACTIONSCRIPT @@ -526,8 +442,6 @@ ft->name = g_strdup("ActionScript"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.as", NULL); - ft->comment_open = g_strdup("//"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define R @@ -536,8 +450,6 @@ ft->name = g_strdup("R"); ft->title = g_strdup_printf(_("%s script file"), "R"); ft->pattern = utils_strv_new("*.R", "*.r", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define REST @@ -547,8 +459,6 @@ filetype_make_title(ft, TITLE_FILE); ft->pattern = utils_strv_new( "*.rest", "*.reST", "*.rst", NULL); - ft->comment_open = NULL; - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define MATLAB @@ -557,8 +467,6 @@ ft->name = g_strdup("Matlab/Octave"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.m", NULL); - ft->comment_open = g_strdup("%"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define YAML @@ -567,8 +475,6 @@ ft->name = g_strdup("YAML"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.yaml", "*.yml", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define CMAKE @@ -577,8 +483,6 @@ ft->name = g_strdup("CMake"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("CMakeLists.txt", "*.cmake", "*.ctest", NULL); - ft->comment_open = g_strdup("#"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define NSIS @@ -587,8 +491,6 @@ ft->name = g_strdup("NSIS"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.nsi", "*.nsh", NULL); - ft->comment_open = g_strdup(";"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; #define ADA @@ -597,8 +499,6 @@ ft->name = g_strdup("Ada"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.adb", "*.ads", NULL); - ft->comment_open = g_strdup("--"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define FORTH @@ -607,8 +507,6 @@ ft->name = g_strdup("Forth"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->pattern = utils_strv_new("*.fs", "*.fth", NULL); - ft->comment_open = g_strdup("\\"); - ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5309] trunk
by ntrel＠users.sourceforge.net 20 Oct '10

20 Oct '10

Revision: 5309 http://geany.svn.sourceforge.net/geany/?rev=5309&view=rev Author: ntrel Date: 2010-10-20 16:15:39 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Move filetype 'extension' default into data files. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.actionscript trunk/data/filetypes.ada trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.cmake trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.cs trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.diff trunk/data/filetypes.docbook trunk/data/filetypes.f77 trunk/data/filetypes.ferite trunk/data/filetypes.forth trunk/data/filetypes.fortran trunk/data/filetypes.freebasic trunk/data/filetypes.glsl trunk/data/filetypes.haskell trunk/data/filetypes.haxe trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.javascript trunk/data/filetypes.latex trunk/data/filetypes.lisp trunk/data/filetypes.lua trunk/data/filetypes.makefile trunk/data/filetypes.matlab trunk/data/filetypes.nsis trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.po trunk/data/filetypes.python trunk/data/filetypes.r trunk/data/filetypes.restructuredtext trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vala trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/ChangeLog 2010-10-20 16:15:39 UTC (rev 5309) @@ -10,6 +10,8 @@ src/about.c, src/filetypes.c, src/filetypes.h, THANKS, data/filetype_extensions.conf, data/filetypes.erlang, wscript: Add Erlang filetype (patch by Taylor Venable, thanks). + * src/filetypes.c, data/filetypes.*: + Move filetype 'extension' default into data files. 2010-10-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/data/filetypes.actionscript =================================================================== --- trunk/data/filetypes.actionscript 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.actionscript 2010-10-20 16:15:39 UTC (rev 5309) @@ -32,7 +32,7 @@ [settings] # default extension used when saving files -#extension=as +extension=as # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.ada =================================================================== --- trunk/data/filetypes.ada 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.ada 2010-10-20 16:15:39 UTC (rev 5309) @@ -21,7 +21,7 @@ [settings] # default extension used when saving files -#extension=adb +extension=adb # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.asm 2010-10-20 16:15:39 UTC (rev 5309) @@ -27,7 +27,7 @@ [settings] # default extension used when saving files -#extension=asm +extension=asm # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.c 2010-10-20 16:15:39 UTC (rev 5309) @@ -40,7 +40,7 @@ [settings] # default extension used when saving files -#extension=c +extension=c # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.caml 2010-10-20 16:15:39 UTC (rev 5309) @@ -24,7 +24,7 @@ [settings] # default extension used when saving files -#extension=ml +extension=ml # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.cmake =================================================================== --- trunk/data/filetypes.cmake 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.cmake 2010-10-20 16:15:39 UTC (rev 5309) @@ -26,7 +26,7 @@ [settings] # default extension used when saving files -#extension=cmake +extension=cmake # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.conf 2010-10-20 16:15:39 UTC (rev 5309) @@ -15,7 +15,7 @@ [settings] # default extension used when saving files -#extension=conf +extension=conf # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.cpp 2010-10-20 16:15:39 UTC (rev 5309) @@ -42,7 +42,7 @@ lexer_filetype=C # default extension used when saving files -#extension=cpp +extension=cpp # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.cs =================================================================== --- trunk/data/filetypes.cs 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.cs 2010-10-20 16:15:39 UTC (rev 5309) @@ -42,7 +42,7 @@ lexer_filetype=C # default extension used when saving files -#extension=cs +extension=cs # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.css 2010-10-20 16:15:39 UTC (rev 5309) @@ -40,7 +40,7 @@ [settings] # default extension used when saving files -#extension=css +extension=css # the following characters are these which a "word" can contains, see documentation #wordchars=_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.d 2010-10-20 16:15:39 UTC (rev 5309) @@ -30,7 +30,7 @@ [settings] # default extension used when saving files -#extension=d +extension=d # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.diff =================================================================== --- trunk/data/filetypes.diff 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.diff 2010-10-20 16:15:39 UTC (rev 5309) @@ -13,7 +13,7 @@ [settings] # default extension used when saving files -#extension=diff +extension=diff # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.docbook 2010-10-20 16:15:39 UTC (rev 5309) @@ -42,7 +42,7 @@ [settings] # default extension used when saving files -#extension=docbook +extension=docbook # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.f77 =================================================================== --- trunk/data/filetypes.f77 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.f77 2010-10-20 16:15:39 UTC (rev 5309) @@ -28,7 +28,7 @@ [settings] # default extension used when saving files -#extension=f +extension=f # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.ferite 2010-10-20 16:15:39 UTC (rev 5309) @@ -32,7 +32,7 @@ [settings] # default extension used when saving files -#extension=fe +extension=fe # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.forth =================================================================== --- trunk/data/filetypes.forth 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.forth 2010-10-20 16:15:39 UTC (rev 5309) @@ -21,13 +21,13 @@ [settings] # default extension used when saving files -#extension=fs +extension=fs # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank -comment_open=( +comment_open=( comment_close= ) # comment_open=\ Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.fortran 2010-10-20 16:15:39 UTC (rev 5309) @@ -28,7 +28,7 @@ [settings] # default extension used when saving files -#extension=f90 +extension=f90 # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.freebasic =================================================================== --- trunk/data/filetypes.freebasic 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.freebasic 2010-10-20 16:15:39 UTC (rev 5309) @@ -32,7 +32,7 @@ [settings] # default extension used when saving files -#extension=bas +extension=bas # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.glsl =================================================================== --- trunk/data/filetypes.glsl 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.glsl 2010-10-20 16:15:39 UTC (rev 5309) @@ -45,7 +45,7 @@ lexer_filetype=C # default extension used when saving files -#extension=glsl +extension=glsl # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.haskell =================================================================== --- trunk/data/filetypes.haskell 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.haskell 2010-10-20 16:15:39 UTC (rev 5309) @@ -26,7 +26,7 @@ [settings] # default extension used when saving files -#extension=hs +extension=hs # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.haxe =================================================================== --- trunk/data/filetypes.haxe 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.haxe 2010-10-20 16:15:39 UTC (rev 5309) @@ -33,7 +33,7 @@ [settings] # default extension used when saving files -#extension=hx +extension=hx # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.html 2010-10-20 16:15:39 UTC (rev 5309) @@ -11,7 +11,7 @@ [settings] # default extension used when saving files -#extension=html +extension=html # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.java 2010-10-20 16:15:39 UTC (rev 5309) @@ -34,7 +34,7 @@ [settings] # default extension used when saving files -#extension=java +extension=java # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.javascript 2010-10-20 16:15:39 UTC (rev 5309) @@ -31,7 +31,7 @@ [settings] # default extension used when saving files -#extension=js +extension=js # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.latex 2010-10-20 16:15:39 UTC (rev 5309) @@ -14,7 +14,7 @@ [settings] # default extension used when saving files -#extension=tex +extension=tex # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.lisp =================================================================== --- trunk/data/filetypes.lisp 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.lisp 2010-10-20 16:15:39 UTC (rev 5309) @@ -20,11 +20,11 @@ [keywords] # all items must be in one line keywords=abort abs acons acos acosh add-method adjoin adjust-array adjustable-array-p alpha-char-p alphanumericp alter append apply applyhook apropos apropos-list aref arithmetic-error-operands arithmetic-error-operation array-dimension array-dimensions array-element-type array-has-fill-pointer-p array-in-bounds-p array-rank array-row-major-index array-total-size arrayp ash asin asinh assoc assoc-if assoc-if-not atan atanh atom augment-environment bit bit-and bit-andc1 bit-andc2 bit-eqv bit-ior bit-nand bit-nor bit-not bit-orc1 bit-orc2 bit-vector-p bit-xor boole both-case-p boundp break broadcast-stream-streams butlast byte byte-position byte-size caaaar caaadr caaar caadar caaddr caadr caar cadaar cadadr cadar caddar cadddr caddr cadr call-next-method car catenate cdaaar cdaadr cdaar cdadar cdaddr cdadr cdar cddaar cddadr cddar cdddar cddddr cdddr cddr cdr ceiling cell-error-name cerror change-class char char-bit char-bits char-code char-downcase char-equal char-font char-greaterp char-int char-lessp char-name char-not-equal char-not-greaterp char-not-lessp char-upcase char/= char< char<= char= char> char>= character characterp choose choose-if chunk cis class-name class-of clear-input close clrhash code-char coerce collect collect-alist collect-and collect-append collect-file collect-first collect-fn collect-hash collect-last collect-length collect-max collect-min collect-nconc collect-nth collect-or collect-plist collect-sum collecting-fn commonp compile compile-file compile-file-pathname compiled-function-p compiler-let compiler-macro-function compiler-macroexpand compiler-macroexpand-1 complement complex complexp compute-applicable-methods compute-restarts concatenate concatenated-stream-streams condition conjugate cons consp continue control-error copy-alist copy-list copy-pprint-dispatch copy-readtable copy-seq copy-symbol copy-tree cos cosh cotruncate count count-if count-if-not declaration-information declare decode-float decode-universal-time delete-duplicates delete-file delete-if delete-if-not delete-package denominator deposit-field describe describe-object digit-char digit-char-p directory directory-namestring disassemble dpb dribble echo-stream-input-stream echo-stream-output-stream ed eighth elt enclose encode-universal-time end-of-file type endp enough-namestring ensure--function eq eql equal equalp error documentation eval eval-when evalhook evenp every exp expand export expt f fboundp fdefinition ffloor fifth file-author file-error type file-error-pathname file-length file-namestring file-position file-string-length file-write-date fill fill-pointer find find-all-symbols find-class find-if find-if-not find-method find-package find-restart find-symbol finish-output first flet float float-digits float-precision float-radix float-sign floatp floor fourth funcall function function-information function-keywords function-lambda-expression functionp format gatherer generic-labels gcd generator generic-flet gensym gentemp get get-decoded-time get-internal-real-time get-internal-run-time get-output-stream-string get-properties get-setf-method get-setf-method-multiple-value get-universal-time getf gethash graphic-char-p hash-table-count hash-table-p hash-table-rehash-size hash-table-rehash-threshold hash-table-size hash-table-test host-namestring identity imagpart import in-package initialize-instance input-stream-p inspect int-char integer-decode-float integer-length integerp interactive-stream-p intern intersection invalid-method-error invoke-debugger invoke-restart isqrt keywordp last latch lcm ldb ldb-test ldiff length lisp-implementation-type lisp-implementation-version list list* list-all-packages list-length listen listp load load-logical-pathname-translations log logand logandc1 logandc2 logbitp logcount logeqv logical-pathname class logical-pathname logical-pathname-translations logior lognand lognor lognot logorc1 logorc2 logtest logxor lower-case-p machine-instance machine-type machine-version macro-function macroexpand macroexpand-1 make-array make-broadcast-stream make-char make-concatenated-stream make-condition make-dispatch-macro-character make-echo-stream make-hash-table make-instance make-instances-obsolete make-list make-load-form make-load-form-saving-slots make-package make-pathname make-random-state make-sequence make-string make-string-input-stream make-string-output-stream make-symbol make-synonym-stream make-two-way-stream makunbound map map-fn map-into mapc mapcan mapcar mapcon maphash mapl maplist mask mask-field max member member-if member-if-not merge merge-pathnames method-combination-error method-qualifiers min mingle minusp mismatch mod muffle-warning name-char namestring nbutlast nconc next-method-p next-out nintersection ninth no-applicable-method no-next-method not notany notevery nreconc nreverse nset-difference nset-exclusive-or nstring-capitalize nstring-downcase nstring-upcase nsublis nsubst nsubst-if nsubst-if-not nsubstitute nsubstitute-if nsubstitute-if-not nth nthcdr null numberp numerator nunion random random-state-p rassoc rassoc-if rassoc-if-not rational rationalize rationalp read read-byte read-char read-char-no-hang read-delimited-list read-from-string read-line read-preserving-whitespace readtable-case readtablep realp realpart reduce reinitialize-instance rem output-stream-p package-error type package-error-package package-name package-nicknames package-shadowing-symbols package-use-list package-used-by-list packagep pairlis parse-integer oddp open open-stream-p parse-macro parse-namestring pathname pathname-device pathname-directory pathname-host pathname-match-p pathname-name pathname-type pathname-version pathnamep peek-char phase plusp position position-if position-if-not positions pprint-dispatch pprint-fill pprint-indent pprint-linear probe-file proclaim pprint-newline pprint-tab pprint-tabular previous print print-object remhash remove remove-duplicates remove-method remprop rename-file rename-package provide replace require rest revappend reverse room round row-major-aref rplaca rplacd restart-name result-of sbit scale-float scan scan-alist scan-file scan-fn scan-fn-inclusive scan-hash scan-lists-of-lists scan-lists-of-lists-fringe scan-multiple scan-plist scan-range scan-sublists scan-symbols schar search second series set set-char-bit set-difference set-dispatch-macro-character set-exclusive-or set-macro-character set-pprint-dispatch set-syntax-from-char shadow shadowing-import shared-initialize short-site-name signal signum simple-bit-vector-p simple-condition-format-arguments simple-condition-format-string simple-string-p simple-vector-p sin sinh sixth sleep slot-boundp slot-exists-p slot-makunbound slot-missing slot-unbound slot-value software-type software-version some sort special-form-p split split-if sqrt stable-sort standard-char-p store-value stream-element-type stream-error-stream stream-external-format streamp string string-capitalize string-char-p string-downcase string-equal string-greaterp string-left-trim string-lessp string-not-equal string-not-greaterp string-not-lessp string-right-trim string-trim string-upcase string/= string< string<= string= string> string>= stringp sublis subseq subseries subsetp subst subst-if subst-if-not substitute substitute-if substitute-if-not subtypep svref sxhash symbol-function symbol-name symbol-package symbol-plist symbol-value symbolp synonym-stream-symbol tailp tan tanh tenth terpri third to-alter translate-logical-pathname translate-pathname tree-equal truename truncate two-way-stream-input-stream two-way-stream-output-stream type-error-datum type-error-expected-type type-of typep unexport unintern union unread-char until-if unuse-package update-instance-for-different-class update-instance-for-redefined-class upgraded-array-element-type upgraded-complex-part-type upper-case-p use-package use-value user-homedir-pathname values values-list variable-information vector vector-pop vector-push vector-push-extend vectorp warn warn wild-pathname-p write write-byte write-char write-string write-to-string y-or-n-p yes-or-no-p zerop -special_keywords=always and appending array-dimension-limit array-rank-limit array-total-size-limit as assert call-arguments-limit call-method case catch ccase char-bits-limit char-code-limit char-control-bit char-font-limit char-hyper-bit char-meta-bit char-super-bit check-type check-type collect collecting compiler-let cond count counting ctypecase ctypecase decf declaim defclass def define-compiler-macro define-condition define-declaration define-method-combination define-modify-macro define-setf-method defmacro defmethod defpackage defstruct deftype defun defvar delete destructuring-bind do do* do-all-symbols do-external-symbols do-symbols doing dolist dotimes double-float-epsilon double-float-negative-epsilon ecase encapsulated etypecase finally for formatter gathering generic-function go handler-bind handler-case if ignore-errors in-package incf initially internal-time-units-per-second iterate lambda-list-keywords lambda-parameters-limit least-negative-double-float least-negative-long-float least-negative-normalized-double-float least-negative-normalized-long-float least-negative-normalized-short-float least-negative-normalized-single-float least-negative-short-float least-negative-single-float least-positive-double-float least-positive-long-float least-positive-normalized-double-float least-positive-normalized-long-float least-positive-normalized-short-float least-positive-normalized-single-float least-positive-short-float least-positive-single-float let let* load-time-value locally locally long-float-epsilon long-float-negative-epsilon long-site-name loop loop-finish mapping maximize maximizing minimize minimizing most-negative-double-float most-negative-fixnum most-negative-long-float most-negative-short-float most-negative-single-float most-positive-double-float most-positive-fixnum most-positive-long-float most-positive-short-float most-positive-single-float multiple-value-bind multiple-value-call multiple-value-list multiple-value-prog1 multiple-value-setq multiple-values-limit named nconc nconcing never next-in nil nth-value off-line-port optimizable-series-function or pi pop pprint-exit-if-list-exhausted pprint-logical-block pprint-pop print-unreadable-object producing prog prog* prog1 prog2 progn progv propagate-alterability psetf psetq push pushnew quote remf repeat restart-bind restart-case return return-from rotatef setf setq seventh shiftf short-float-epsilon short-float-negative-epsilon single-float-epsilon single-float-negative-epsilon step sum summing symbol-macrolet t tagbody terminate-producing the thereis time throw trace typecase unless until untrace unwind-protect when when while with with-accessors with-added-methods with-compilation-unit with-condition-restarts with-hash-table-iterator with-input-from-string with-open-file with-open-stream with-output-to-string with-package-iterator with-simple-restart with-slots with-standard-io-syntax +special_keywords=always and appending array-dimension-limit array-rank-limit array-total-size-limit as assert call-arguments-limit call-method case catch ccase char-bits-limit char-code-limit char-control-bit char-font-limit char-hyper-bit char-meta-bit char-super-bit check-type check-type collect collecting compiler-let cond count counting ctypecase ctypecase decf declaim defclass def define-compiler-macro define-condition define-declaration define-method-combination define-modify-macro define-setf-method defmacro defmethod defpackage defstruct deftype defun defvar delete destructuring-bind do do* do-all-symbols do-external-symbols do-symbols doing dolist dotimes double-float-epsilon double-float-negative-epsilon ecase encapsulated etypecase finally for formatter gathering generic-function go handler-bind handler-case if ignore-errors in-package incf initially internal-time-units-per-second iterate lambda-list-keywords lambda-parameters-limit least-negative-double-float least-negative-long-float least-negative-normalized-double-float least-negative-normalized-long-float least-negative-normalized-short-float least-negative-normalized-single-float least-negative-short-float least-negative-single-float least-positive-double-float least-positive-long-float least-positive-normalized-double-float least-positive-normalized-long-float least-positive-normalized-short-float least-positive-normalized-single-float least-positive-short-float least-positive-single-float let let* load-time-value locally locally long-float-epsilon long-float-negative-epsilon long-site-name loop loop-finish mapping maximize maximizing minimize minimizing most-negative-double-float most-negative-fixnum most-negative-long-float most-negative-short-float most-negative-single-float most-positive-double-float most-positive-fixnum most-positive-long-float most-positive-short-float most-positive-single-float multiple-value-bind multiple-value-call multiple-value-list multiple-value-prog1 multiple-value-setq multiple-values-limit named nconc nconcing never next-in nil nth-value off-line-port optimizable-series-function or pi pop pprint-exit-if-list-exhausted pprint-logical-block pprint-pop print-unreadable-object producing prog prog* prog1 prog2 progn progv propagate-alterability psetf psetq push pushnew quote remf repeat restart-bind restart-case return return-from rotatef setf setq seventh shiftf short-float-epsilon short-float-negative-epsilon single-float-epsilon single-float-negative-epsilon step sum summing symbol-macrolet t tagbody terminate-producing the thereis time throw trace typecase unless until untrace unwind-protect when when while with with-accessors with-added-methods with-compilation-unit with-condition-restarts with-hash-table-iterator with-input-from-string with-open-file with-open-stream with-output-to-string with-package-iterator with-simple-restart with-slots with-standard-io-syntax [settings] # default extension used when saving files -#extension=lisp +extension=lisp # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.lua =================================================================== --- trunk/data/filetypes.lua 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.lua 2010-10-20 16:15:39 UTC (rev 5309) @@ -39,7 +39,7 @@ [settings] # default extension used when saving files -#extension=lua +extension=lua # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.makefile 2010-10-20 16:15:39 UTC (rev 5309) @@ -14,7 +14,7 @@ [settings] # default extension used when saving files -#extension=mak +extension=mak # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.matlab =================================================================== --- trunk/data/filetypes.matlab 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.matlab 2010-10-20 16:15:39 UTC (rev 5309) @@ -17,7 +17,7 @@ [settings] # default extension used when saving files -#extension=m +extension=m # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.nsis =================================================================== --- trunk/data/filetypes.nsis 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.nsis 2010-10-20 16:15:39 UTC (rev 5309) @@ -35,7 +35,7 @@ [settings] # default extension used when saving files -#extension=nsi +extension=nsi # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.pascal 2010-10-20 16:15:39 UTC (rev 5309) @@ -28,7 +28,7 @@ [settings] # default extension used when saving files -#extension=pas +extension=pas # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.perl 2010-10-20 16:15:39 UTC (rev 5309) @@ -47,7 +47,7 @@ [settings] # default extension used when saving files -#extension=pl +extension=pl # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.php 2010-10-20 16:15:39 UTC (rev 5309) @@ -7,7 +7,7 @@ [settings] # default extension used when saving files -#extension=php +extension=php # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.po =================================================================== --- trunk/data/filetypes.po 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.po 2010-10-20 16:15:39 UTC (rev 5309) @@ -16,7 +16,7 @@ [settings] # default extension used when saving files -#extension=po +extension=po # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.python 2010-10-20 16:15:39 UTC (rev 5309) @@ -31,7 +31,7 @@ [settings] # default extension used when saving files -#extension=py +extension=py # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.r =================================================================== --- trunk/data/filetypes.r 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.r 2010-10-20 16:15:39 UTC (rev 5309) @@ -27,7 +27,7 @@ [settings] # default extension used when saving files -#extension=R +extension=R # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.restructuredtext =================================================================== --- trunk/data/filetypes.restructuredtext 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.restructuredtext 2010-10-20 16:15:39 UTC (rev 5309) @@ -4,7 +4,7 @@ [settings] # default extension used when saving files -#extension=rst +extension=rst # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.ruby 2010-10-20 16:15:39 UTC (rev 5309) @@ -44,7 +44,7 @@ [settings] # default extension used when saving files -#extension=rb +extension=rb # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.sh 2010-10-20 16:15:39 UTC (rev 5309) @@ -22,7 +22,7 @@ [settings] # default extension used when saving files -#extension=sh +extension=sh # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.sql 2010-10-20 16:15:39 UTC (rev 5309) @@ -24,7 +24,7 @@ [settings] # default extension used when saving files -#extension=sql +extension=sql # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.tcl 2010-10-20 16:15:39 UTC (rev 5309) @@ -29,7 +29,7 @@ [settings] # default extension used when saving files -#extension=tcl +extension=tcl # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.vala =================================================================== --- trunk/data/filetypes.vala 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.vala 2010-10-20 16:15:39 UTC (rev 5309) @@ -42,7 +42,7 @@ lexer_filetype=C # default extension used when saving files -#extension=vala +extension=vala # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.vhdl 2010-10-20 16:15:39 UTC (rev 5309) @@ -29,7 +29,7 @@ [settings] # default extension used when saving files -#extension=vhd +extension=vhd # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/data/filetypes.xml 2010-10-20 16:15:39 UTC (rev 5309) @@ -83,7 +83,7 @@ [settings] # default extension used when saving files -#extension=xml +extension=xml # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-20 15:45:25 UTC (rev 5308) +++ trunk/src/filetypes.c 2010-10-20 16:15:39 UTC (rev 5309) @@ -96,7 +96,6 @@ ft->lang = -2; ft->name = g_strdup(_("None")); ft->title = g_strdup(_("None")); - ft->extension = NULL; ft->pattern = utils_strv_new("*", NULL); ft->comment_open = NULL; ft->comment_close = NULL; @@ -107,7 +106,6 @@ ft->lang = 0; ft->name = g_strdup("C"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("c"); ft->pattern = utils_strv_new("*.c", "*.h", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -118,7 +116,6 @@ ft->lang = 1; ft->name = g_strdup("C++"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("cpp"); ft->pattern = utils_strv_new("*.cpp", "*.cxx", "*.c++", "*.cc", "*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", "*.C", NULL); ft->comment_open = g_strdup("//"); @@ -130,7 +127,6 @@ ft->lang = 25; ft->name = g_strdup("C#"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("cs"); ft->pattern = utils_strv_new("*.cs", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; @@ -141,7 +137,6 @@ ft->lang = 33; ft->name = g_strdup("Vala"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("vala"); ft->pattern = utils_strv_new("*.vala", "*.vapi", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; @@ -152,7 +147,6 @@ ft->lang = 17; ft->name = g_strdup("D"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("d"); ft->pattern = utils_strv_new("*.d", "*.di", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; @@ -163,7 +157,6 @@ ft->lang = 2; ft->name = g_strdup("Java"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("java"); ft->pattern = utils_strv_new("*.java", "*.jsp", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -174,7 +167,6 @@ ft->lang = 4; ft->name = g_strdup("Pascal"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("pas"); ft->pattern = utils_strv_new("*.pas", "*.pp", "*.inc", "*.dpr", "*.dpk", NULL); ft->comment_open = g_strdup("{"); @@ -186,7 +178,6 @@ ft->lang = 9; ft->name = g_strdup("ASM"); ft->title = g_strdup_printf(_("%s source file"), "Assembler"); - ft->extension = g_strdup("asm"); ft->pattern = utils_strv_new("*.asm", NULL); ft->comment_open = g_strdup(";"); ft->comment_close = NULL; @@ -197,7 +188,6 @@ ft->lang = 26; ft->name = g_strdup("FreeBasic"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("bas"); ft->pattern = utils_strv_new("*.bas", "*.bi", NULL); ft->comment_open = g_strdup("'"); ft->comment_close = NULL; @@ -208,7 +198,6 @@ ft->lang = 18; ft->name = g_strdup("Fortran"); ft->title = g_strdup_printf(_("%s source file"), "Fortran (F90)"); - ft->extension = g_strdup("f90"); ft->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL); ft->comment_open = g_strdup("!"); ft->comment_close = NULL; @@ -219,7 +208,6 @@ ft->lang = 30; ft->name = g_strdup("F77"); ft->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); - ft->extension = g_strdup("f"); ft->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", NULL); ft->comment_open = g_strdup("c"); ft->comment_close = NULL; @@ -230,7 +218,6 @@ ft->lang = 31; ft->name = g_strdup("GLSL"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("glsl"); ft->pattern = utils_strv_new("*.glsl", "*.frag", "*.vert", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -241,7 +228,6 @@ ft->lang = -2; ft->name = g_strdup("CAML"); ft->title = g_strdup_printf(_("%s source file"), "(O)Caml"); - ft->extension = g_strdup("ml"); ft->pattern = utils_strv_new("*.ml", "*.mli", NULL); ft->comment_open = g_strdup("(*"); ft->comment_close = g_strdup("*)"); @@ -252,7 +238,6 @@ ft->lang = 5; ft->name = g_strdup("Perl"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("pl"); ft->pattern = utils_strv_new("*.pl", "*.perl", "*.pm", "*.agi", "*.pod", NULL); ft->comment_open = g_strdup("#"); @@ -264,7 +249,6 @@ ft->lang = 6; ft->name = g_strdup("PHP"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("php"); ft->pattern = utils_strv_new("*.php", "*.php3", "*.php4", "*.php5", "*.phtml", NULL); ft->comment_open = g_strdup("//"); @@ -276,7 +260,6 @@ ft->lang = 23; ft->name = g_strdup("Javascript"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("js"); ft->pattern = utils_strv_new("*.js", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; @@ -287,7 +270,6 @@ ft->lang = 7; ft->name = g_strdup("Python"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("py"); ft->pattern = utils_strv_new("*.py", "*.pyw", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -298,7 +280,6 @@ ft->lang = 14; ft->name = g_strdup("Ruby"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("rb"); ft->pattern = utils_strv_new("*.rb", "*.rhtml", "*.ruby", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -309,7 +290,6 @@ ft->lang = 15; ft->name = g_strdup("Tcl"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("tcl"); ft->pattern = utils_strv_new("*.tcl", "*.tk", "*.wish", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -320,7 +300,6 @@ ft->lang = 22; ft->name = g_strdup("Lua"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("lua"); ft->pattern = utils_strv_new("*.lua", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; @@ -331,7 +310,6 @@ ft->lang = 19; ft->name = g_strdup("Ferite"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("fe"); ft->pattern = utils_strv_new("*.fe", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -342,7 +320,6 @@ ft->lang = 24; ft->name = g_strdup("Haskell"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("hs"); ft->pattern = utils_strv_new("*.hs", "*.lhs", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; @@ -353,7 +330,6 @@ ft->lang = 36; ft->name = g_strdup("Markdown"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("md"); ft->pattern = utils_strv_new("*.mdml", "*.mdwn", "*.markdown", "*.md", NULL); ft->comment_open = NULL; ft->comment_close = NULL; @@ -364,7 +340,6 @@ ft->lang = 37; ft->name = g_strdup("Txt2tags"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("t2t"); ft->pattern = utils_strv_new("*.t2t", "*.txt2tags", NULL); ft->comment_open = NULL; ft->comment_close = NULL; @@ -375,7 +350,6 @@ ft->lang = 38; ft->name = g_strdup("Abc"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("abc"); ft->pattern = utils_strv_new("*.abc", "*.abp", NULL); ft->comment_open = NULL; ft->comment_close = NULL; @@ -386,7 +360,6 @@ ft->lang = 16; ft->name = g_strdup("Sh"); ft->title = g_strdup(_("Shell script file")); - ft->extension = g_strdup("sh"); ft->pattern = utils_strv_new("*.sh", "configure", "configure.in", "configure.in.in", "configure.ac", "*.ksh", "*.zsh", "*.ash", "*.bash", NULL); ft->comment_open = g_strdup("#"); @@ -398,7 +371,6 @@ ft->lang = 3; ft->name = g_strdup("Make"); ft->title = g_strdup(_("Makefile")); - ft->extension = g_strdup("mak"); ft->pattern = utils_strv_new( "*.mak", "*.mk", "GNUmakefile", "makefile", "Makefile", "makefile.*", "Makefile.*", NULL); ft->comment_open = g_strdup("#"); @@ -410,7 +382,6 @@ ft->lang = -2; ft->name = g_strdup("XML"); ft->title = g_strdup(_("XML document")); - ft->extension = g_strdup("xml"); ft->pattern = utils_strv_new( "*.xml", "*.sgml", "*.xsl", "*.xslt", "*.xsd", "*.xhtml", NULL); ft->comment_open = g_strdup(""); @@ -433,7 +403,6 @@ ft->lang = 29; ft->name = g_strdup("HTML"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("html"); ft->pattern = utils_strv_new( "*.htm", "*.html", "*.shtml", "*.hta", "*.htd", "*.htt", "*.cfm", NULL); ft->comment_open = g_strdup("<!--"); @@ -445,7 +414,6 @@ ft->lang = 13; ft->name = g_strdup("CSS"); ft->title = g_strdup(_("Cascading StyleSheet")); - ft->extension = g_strdup("css"); ft->pattern = utils_strv_new("*.css", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -456,7 +424,6 @@ ft->lang = 11; ft->name = g_strdup("SQL"); ft->title = g_strdup(_("SQL Dump file")); - ft->extension = g_strdup("sql"); ft->pattern = utils_strv_new("*.sql", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -467,7 +434,6 @@ ft->lang = 8; ft->name = g_strdup("LaTeX"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("tex"); ft->pattern = utils_strv_new("*.tex", "*.sty", "*.idx", "*.ltx", NULL); ft->comment_open = g_strdup("%"); ft->comment_close = NULL; @@ -478,7 +444,6 @@ ft->lang = 21; ft->name = g_strdup("VHDL"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("vhd"); ft->pattern = utils_strv_new("*.vhd", "*.vhdl", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; @@ -489,7 +454,6 @@ ft->lang = 39; ft->name = g_strdup("Verilog"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("v"); ft->pattern = utils_strv_new("*.v", "*.verilog", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); @@ -500,7 +464,6 @@ ft->lang = 20; ft->name = g_strdup("Diff"); filetype_make_title(ft, TITLE_FILE); - ft->extension = g_strdup("diff"); ft->pattern = utils_strv_new("*.diff", "*.patch", "*.rej", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -511,7 +474,6 @@ ft->lang = -2; ft->name = g_strdup("Lisp"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("lisp"); ft->pattern = utils_strv_new("*.lisp", NULL); ft->comment_open = g_strdup(";"); ft->comment_close = NULL; @@ -522,7 +484,6 @@ ft->lang = -2; ft->name = g_strdup("Erlang"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("erl"); ft->pattern = utils_strv_new("*.erl", NULL); ft->comment_open = g_strdup("%"); ft->comment_close = NULL; @@ -533,7 +494,6 @@ ft->lang = 10; ft->name = g_strdup("Conf"); ft->title = g_strdup(_("Config file")); - ft->extension = g_strdup("conf"); ft->pattern = utils_strv_new("*.conf", "*.ini", "config", "*rc", "*.cfg", "*.desktop", NULL); ft->comment_open = g_strdup("#"); @@ -545,7 +505,6 @@ ft->lang = -2; ft->name = g_strdup("Po"); ft->title = g_strdup(_("Gettext translation file")); - ft->extension = g_strdup("po"); ft->pattern = utils_strv_new("*.po", "*.pot", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -556,7 +515,6 @@ ft->lang = 27; ft->name = g_strdup("Haxe"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("hx"); ft->pattern = utils_strv_new("*.hx", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; @@ -567,7 +525,6 @@ ft->lang = 34; ft->name = g_strdup("ActionScript"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("as"); ft->pattern = utils_strv_new("*.as", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; @@ -578,7 +535,6 @@ ft->lang = 40; ft->name = g_strdup("R"); ft->title = g_strdup_printf(_("%s script file"), "R"); - ft->extension = g_strdup("R"); ft->pattern = utils_strv_new("*.R", "*.r", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -589,7 +545,6 @@ ft->lang = 28; ft->name = g_strdup("reStructuredText"); filetype_make_title(ft, TITLE_FILE); - ft->extension = g_strdup("rst"); ft->pattern = utils_strv_new( "*.rest", "*.reST", "*.rst", NULL); ft->comment_open = NULL; @@ -601,7 +556,6 @@ ft->lang = 32; ft->name = g_strdup("Matlab/Octave"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("m"); ft->pattern = utils_strv_new("*.m", NULL); ft->comment_open = g_strdup("%"); ft->comment_close = NULL; @@ -612,7 +566,6 @@ ft->lang = -2; ft->name = g_strdup("YAML"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("yaml"); ft->pattern = utils_strv_new("*.yaml", "*.yml", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -623,7 +576,6 @@ ft->lang = -2; ft->name = g_strdup("CMake"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("cmake"); ft->pattern = utils_strv_new("CMakeLists.txt", "*.cmake", "*.ctest", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; @@ -634,7 +586,6 @@ ft->lang = 35; ft->name = g_strdup("NSIS"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("nsis"); ft->pattern = utils_strv_new("*.nsi", "*.nsh", NULL); ft->comment_open = g_strdup(";"); ft->comment_close = NULL; @@ -645,7 +596,6 @@ ft->lang = -2; ft->name = g_strdup("Ada"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("adb"); ft->pattern = utils_strv_new("*.adb", "*.ads", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; @@ -656,7 +606,6 @@ ft->lang = -2; ft->name = g_strdup("Forth"); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->extension = g_strdup("fs"); ft->pattern = utils_strv_new("*.fs", "*.fth", NULL); ft->comment_open = g_strdup("\\"); ft->comment_close = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5308] trunk
by ntrel＠users.sourceforge.net 20 Oct '10

20 Oct '10

Revision: 5308 http://geany.svn.sourceforge.net/geany/?rev=5308&view=rev Author: ntrel Date: 2010-10-20 15:45:25 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Add Erlang filetype (patch by Taylor Venable, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/data/filetype_extensions.conf trunk/scintilla/KeyWords.cxx trunk/scintilla/Makefile.am trunk/scintilla/makefile.win32 trunk/src/about.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/wscript Added Paths: ----------- trunk/data/filetypes.erlang trunk/scintilla/LexErlang.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/ChangeLog 2010-10-20 15:45:25 UTC (rev 5308) @@ -5,6 +5,11 @@ Don't hide the menu when only the default item is available. * data/colorschemes, data/colorschemes/alt.conf, wscript, Makefile.am: Add alternative color scheme based on Python colors. + * scintilla/LexErlang.cxx, scintilla/makefile.win32, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + src/about.c, src/filetypes.c, src/filetypes.h, THANKS, + data/filetype_extensions.conf, data/filetypes.erlang, wscript: + Add Erlang filetype (patch by Taylor Venable, thanks). 2010-10-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/THANKS 2010-10-20 15:45:25 UTC (rev 5308) @@ -85,6 +85,7 @@ Thomas Huth <th(dot)huth(at)googlemail(dot)com> - Forth filetype Adam Ples <adamples(at)users(dot)sourceforge(dot)net> - Group encodings in open dialog Mário Silva <sharelider(at)gmail(dot)com> - Lisp filetype +Taylor Venable <taylor(at)metasyntax(dot)net> - Erlang filetype Translators: ------------ Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/data/filetype_extensions.conf 2010-10-20 15:45:25 UTC (rev 5308) @@ -16,6 +16,7 @@ D=*.d;*.di; Diff=*.diff;*.patch;*.rej; Docbook=*.docbook; +Erlang=*.erl; F77=*.f;*.for;*.ftn;*.f77; Ferite=*.fe; Forth=*.fs;*.fth; Added: trunk/data/filetypes.erlang =================================================================== --- trunk/data/filetypes.erlang (rev 0) +++ trunk/data/filetypes.erlang 2010-10-20 15:45:25 UTC (rev 5308) @@ -0,0 +1,71 @@ +[styling] +# Each of these (...) refers to the lexer state SCE_ERLANG_(...) +default=default +comment=comment +variable=default +number=number +keyword=word +string=string +operator=operator +atom=default +function_name=default,bold +character=default +macro=preprocessor +record=type +preproc=preprocessor +node_name=default +comment_function=comment +comment_module=comment +comment_doc=comment +comment_doc_macro=comment +atom_quoted=default +macro_quoted=default +record_quoted=default +node_name_quoted=default +bifs=word2 +modules=default +modules_att=preprocessor +unknown=default + +[keywords] +# all items must be in one line +keywords=after and andalso band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse query receive rem try when xor +# Erlang built-in functions (BIFs) +bifs=erlang: abs adler32 adler32_combine erlang:append_element apply atom_to_binary atom_to_list binary_to_atom binary_to_existing_atom binary_to_list bitstring_to_list binary_to_term bit_size erlang:bump_reductions byte_size erlang:cancel_timer check_process_code concat_binary crc32 crc32_combine date decode_packet delete_module erlang:demonitor disconnect_node erlang:display element erase erlang:error exit float float_to_list erlang:fun_info erlang:fun_to_list erlang:function_exported garbage_collect get erlang:get_cookie get_keys erlang:get_stacktrace group_leader halt erlang:hash hd erlang:hibernate integer_to_list erlang:integer_to_list iolist_to_binary iolist_size is_alive is_atom is_binary is_bitstring is_boolean erlang:is_builtin is_float is_function is_integer is_list is_number is_pid is_port is_process_alive is_record is_reference is_tuple length link list_to_atom list_to_binary list_to_bitstring list_to_existing_atom list_to_float list_to_integer erlang:list_to_integer list_to_pid list_to_tuple load_module erlang:load_nif erlang:loaded erlang:localtime erlang:localtime_to_universaltime make_ref erlang:make_tuple erlang:max erlang:md5 erlang:md5_final erlang:md5_init erlang:md5_update erlang:memory erlang:min module_loaded erlang:monitor monitor_node node nodes now open_port erlang:phash erlang:phash2 pid_to_list port_close port_command erlang:port_command port_connect port_control erlang:port_call erlang:port_info erlang:port_to_list erlang:ports pre_loaded erlang:process_display process_flag process_info processes purge_module put erlang:raise erlang:read_timer erlang:ref_to_list register registered erlang:resume_process round self erlang:send erlang:send_after erlang:send_nosuspend erlang:set_cookie setelement size spawn spawn_link spawn_monitor spawn_opt split_binary erlang:start_timer statistics erlang:suspend_process erlang:system_flag erlang:system_info erlang:system_monitor erlang:system_profile term_to_binary throw time tl erlang:trace erlang:trace_delivered erlang:trace_info erlang:trace_pattern trunc tuple_size tuple_to_list erlang:universaltime erlang:universaltime_to_localtime unlink unregister whereis erlang:yield +# Erlang preprocessor instructions +preproc=-define -else -endif -ifdef -ifndef -include -include_lib -undef +# Erlang module attributes +module=-behavior -behaviour -compile -created -created_by -export -file -import -module -modified -modified_by -record -revision -spec -type -vsn +# Erlang documentation helpers +doc=@author @clear @copyright @deprecated @doc @docfile @end @equiv @headerfile @hidden @private @reference @see @since @spec @throws @title @todo @TODO @type @version +# Erlang documentation macros +doc_macro=@date @docRoot @link @module @package @section @time @type @version + +[settings] +# default extension used when saving files +extension=erl + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=% +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=erlc "%f" +run_cmd=erl "%f" Property changes on: trunk/data/filetypes.erlang ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/scintilla/KeyWords.cxx 2010-10-20 15:45:25 UTC (rev 5308) @@ -337,6 +337,7 @@ LINK_LEXER(lmCss); LINK_LEXER(lmD); LINK_LEXER(lmDiff); + LINK_LEXER(lmErlang); LINK_LEXER(lmF77); LINK_LEXER(lmForth); LINK_LEXER(lmFortran); Added: trunk/scintilla/LexErlang.cxx =================================================================== --- trunk/scintilla/LexErlang.cxx (rev 0) +++ trunk/scintilla/LexErlang.cxx 2010-10-20 15:45:25 UTC (rev 5308) @@ -0,0 +1,619 @@ +// Scintilla source code edit control +// Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. +/** @file LexErlang.cxx + ** Lexer for Erlang. + ** Enhanced by Etienne 'Lenain' Girondel (lenaing(a)gmail.com) + ** Originally wrote by Peter-Henry Mander, + ** based on Matlab lexer by Jos\xE9 Fonseca. + **/ + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdio.h> +#include <stdarg.h> + +#include "Platform.h" +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static int is_radix(int radix, int ch) { + int digit; + + if (36 < radix || 2 > radix) + return 0; + + if (isdigit(ch)) { + digit = ch - '0'; + } else if (isalnum(ch)) { + digit = toupper(ch) - 'A' + 10; + } else { + return 0; + } + + return (digit < radix); +} + +typedef enum { + STATE_NULL, + COMMENT, + COMMENT_FUNCTION, + COMMENT_MODULE, + COMMENT_DOC, + COMMENT_DOC_MACRO, + ATOM_UNQUOTED, + ATOM_QUOTED, + NODE_NAME_UNQUOTED, + NODE_NAME_QUOTED, + MACRO_START, + MACRO_UNQUOTED, + MACRO_QUOTED, + RECORD_START, + RECORD_UNQUOTED, + RECORD_QUOTED, + NUMERAL_START, + NUMERAL_BASE_VALUE, + NUMERAL_FLOAT, + NUMERAL_EXPONENT, + PREPROCESSOR +} atom_parse_state_t; + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80) && (ch != ' ') && (isalnum(ch) || ch == '_'); +} + +static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + + StyleContext sc(startPos, length, initStyle, styler); + WordList &reservedWords = *keywordlists[0]; + WordList &erlangBIFs = *keywordlists[1]; + WordList &erlangPreproc = *keywordlists[2]; + WordList &erlangModulesAtt = *keywordlists[3]; + WordList &erlangDoc = *keywordlists[4]; + WordList &erlangDocMacro = *keywordlists[5]; + int radix_digits = 0; + int exponent_digits = 0; + atom_parse_state_t parse_state = STATE_NULL; + atom_parse_state_t old_parse_state = STATE_NULL; + bool to_late_to_comment = false; + char cur[100]; + int old_style = SCE_ERLANG_DEFAULT; + + styler.StartAt(startPos); + + for (; sc.More(); sc.Forward()) { + int style = SCE_ERLANG_DEFAULT; + if (STATE_NULL != parse_state) { + + switch (parse_state) { + + case STATE_NULL : sc.SetState(SCE_ERLANG_DEFAULT); break; + + /* COMMENTS ------------------------------------------------------*/ + case COMMENT : { + if (sc.ch != '%') { + to_late_to_comment = true; + } else if (!to_late_to_comment && sc.ch == '%') { + // Switch to comment level 2 (Function) + sc.ChangeState(SCE_ERLANG_COMMENT_FUNCTION); + old_style = SCE_ERLANG_COMMENT_FUNCTION; + parse_state = COMMENT_FUNCTION; + sc.Forward(); + } + } + // V--- Falling through! + case COMMENT_FUNCTION : { + if (sc.ch != '%') { + to_late_to_comment = true; + } else if (!to_late_to_comment && sc.ch == '%') { + // Switch to comment level 3 (Module) + sc.ChangeState(SCE_ERLANG_COMMENT_MODULE); + old_style = SCE_ERLANG_COMMENT_MODULE; + parse_state = COMMENT_MODULE; + sc.Forward(); + } + } + // V--- Falling through! + case COMMENT_MODULE : { + if (parse_state != COMMENT) { + // Search for comment documentation + if (sc.chNext == '@') { + old_parse_state = parse_state; + parse_state = ('{' == sc.ch) + ? COMMENT_DOC_MACRO + : COMMENT_DOC; + sc.ForwardSetState(sc.state); + } + } + + // All comments types fall here. + if (sc.atLineEnd) { + to_late_to_comment = false; + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + case COMMENT_DOC : + // V--- Falling through! + case COMMENT_DOC_MACRO : { + + if (!isalnum(sc.ch)) { + // Try to match documentation comment + sc.GetCurrent(cur, sizeof(cur)); + + if (parse_state == COMMENT_DOC_MACRO + && erlangDocMacro.InList(cur)) { + sc.ChangeState(SCE_ERLANG_COMMENT_DOC_MACRO); + while (sc.ch != '}' && !sc.atLineEnd) + sc.Forward(); + } else if (erlangDoc.InList(cur)) { + sc.ChangeState(SCE_ERLANG_COMMENT_DOC); + } else { + sc.ChangeState(old_style); + } + + // Switch back to old state + sc.SetState(old_style); + parse_state = old_parse_state; + } + + if (sc.atLineEnd) { + to_late_to_comment = false; + sc.ChangeState(old_style); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* -------------------------------------------------------------- */ + /* Atoms ---------------------------------------------------------*/ + case ATOM_UNQUOTED : { + if ('@' == sc.ch){ + parse_state = NODE_NAME_UNQUOTED; + } else if (sc.ch == ':') { + // Searching for module name + if (sc.chNext == ' ') { + // error + sc.ChangeState(SCE_ERLANG_UNKNOWN); + parse_state = STATE_NULL; + } else { + sc.Forward(); + if (isalnum(sc.ch)) { + sc.GetCurrent(cur, sizeof(cur)); + sc.ChangeState(SCE_ERLANG_MODULES); + sc.SetState(SCE_ERLANG_MODULES); + } + } + } else if (!IsAWordChar(sc.ch)) { + + sc.GetCurrent(cur, sizeof(cur)); + if (reservedWords.InList(cur)) { + style = SCE_ERLANG_KEYWORD; + } else if (erlangBIFs.InList(cur) + && strcmp(cur,"erlang:")){ + style = SCE_ERLANG_BIFS; + } else if (sc.ch == '(' || '/' == sc.ch){ + style = SCE_ERLANG_FUNCTION_NAME; + } else { + style = SCE_ERLANG_ATOM; + } + + sc.ChangeState(style); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + + } break; + + case ATOM_QUOTED : { + if ( '@' == sc.ch ){ + parse_state = NODE_NAME_QUOTED; + } else if ('\'' == sc.ch && '\\' != sc.chPrev) { + sc.ChangeState(SCE_ERLANG_ATOM); + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* -------------------------------------------------------------- */ + /* Node names ----------------------------------------------------*/ + case NODE_NAME_UNQUOTED : { + if ('@' == sc.ch) { + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } else if (!IsAWordChar(sc.ch)) { + sc.ChangeState(SCE_ERLANG_NODE_NAME); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + case NODE_NAME_QUOTED : { + if ('@' == sc.ch) { + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } else if ('\'' == sc.ch && '\\' != sc.chPrev) { + sc.ChangeState(SCE_ERLANG_NODE_NAME_QUOTED); + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* -------------------------------------------------------------- */ + /* Records -------------------------------------------------------*/ + case RECORD_START : { + if ('\'' == sc.ch) { + parse_state = RECORD_QUOTED; + } else if (isalpha(sc.ch) && islower(sc.ch)) { + parse_state = RECORD_UNQUOTED; + } else { // error + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + case RECORD_UNQUOTED : { + if (!IsAWordChar(sc.ch)) { + sc.ChangeState(SCE_ERLANG_RECORD); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + case RECORD_QUOTED : { + if ('\'' == sc.ch && '\\' != sc.chPrev) { + sc.ChangeState(SCE_ERLANG_RECORD_QUOTED); + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* -------------------------------------------------------------- */ + /* Macros --------------------------------------------------------*/ + case MACRO_START : { + if ('\'' == sc.ch) { + parse_state = MACRO_QUOTED; + } else if (isalpha(sc.ch)) { + parse_state = MACRO_UNQUOTED; + } else { // error + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + case MACRO_UNQUOTED : { + if (!IsAWordChar(sc.ch)) { + sc.ChangeState(SCE_ERLANG_MACRO); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + case MACRO_QUOTED : { + if ('\'' == sc.ch && '\\' != sc.chPrev) { + sc.ChangeState(SCE_ERLANG_MACRO_QUOTED); + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* -------------------------------------------------------------- */ + /* Numerics ------------------------------------------------------*/ + /* Simple integer */ + case NUMERAL_START : { + if (isdigit(sc.ch)) { + radix_digits *= 10; + radix_digits += sc.ch - '0'; // Assuming ASCII here! + } else if ('#' == sc.ch) { + if (2 > radix_digits || 36 < radix_digits) { + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } else { + parse_state = NUMERAL_BASE_VALUE; + } + } else if ('.' == sc.ch && isdigit(sc.chNext)) { + radix_digits = 0; + parse_state = NUMERAL_FLOAT; + } else if ('e' == sc.ch || 'E' == sc.ch) { + exponent_digits = 0; + parse_state = NUMERAL_EXPONENT; + } else { + radix_digits = 0; + sc.ChangeState(SCE_ERLANG_NUMBER); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* Integer in other base than 10 (x#yyy) */ + case NUMERAL_BASE_VALUE : { + if (!is_radix(radix_digits,sc.ch)) { + radix_digits = 0; + + if (!isalnum(sc.ch)) + sc.ChangeState(SCE_ERLANG_NUMBER); + + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* Float (x.yyy) */ + case NUMERAL_FLOAT : { + if ('e' == sc.ch || 'E' == sc.ch) { + exponent_digits = 0; + parse_state = NUMERAL_EXPONENT; + } else if (!isdigit(sc.ch)) { + sc.ChangeState(SCE_ERLANG_NUMBER); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + /* Exponent, either integer or float (xEyy, x.yyEzzz) */ + case NUMERAL_EXPONENT : { + if (('-' == sc.ch || '+' == sc.ch) + && (isdigit(sc.chNext))) { + sc.Forward(); + } else if (!isdigit(sc.ch)) { + if (0 < exponent_digits) + sc.ChangeState(SCE_ERLANG_NUMBER); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } else { + ++exponent_digits; + } + } break; + + /* -------------------------------------------------------------- */ + /* Preprocessor --------------------------------------------------*/ + case PREPROCESSOR : { + if (!IsAWordChar(sc.ch)) { + + sc.GetCurrent(cur, sizeof(cur)); + if (erlangPreproc.InList(cur)) { + style = SCE_ERLANG_PREPROC; + } else if (erlangModulesAtt.InList(cur)) { + style = SCE_ERLANG_MODULES_ATT; + } + + sc.ChangeState(style); + sc.SetState(SCE_ERLANG_DEFAULT); + parse_state = STATE_NULL; + } + } break; + + } + + } /* End of : STATE_NULL != parse_state */ + else + { + switch (sc.state) { + case SCE_ERLANG_VARIABLE : { + if (!IsAWordChar(sc.ch)) + sc.SetState(SCE_ERLANG_DEFAULT); + } break; + case SCE_ERLANG_STRING : { + if (sc.ch == '\"' && sc.chPrev != '\\') + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + } break; + case SCE_ERLANG_COMMENT : { + if (sc.atLineEnd) + sc.SetState(SCE_ERLANG_DEFAULT); + } break; + case SCE_ERLANG_CHARACTER : { + if (sc.chPrev == '\\') { + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + } else if (sc.ch != '\\') { + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + } + } break; + case SCE_ERLANG_OPERATOR : { + if (sc.chPrev == '.') { + if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' + || sc.ch == '^') { + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_ERLANG_DEFAULT); + } else { + sc.SetState(SCE_ERLANG_DEFAULT); + } + } else { + sc.SetState(SCE_ERLANG_DEFAULT); + } + } break; + } + } + + if (sc.state == SCE_ERLANG_DEFAULT) { + bool no_new_state = false; + + switch (sc.ch) { + case '\"' : sc.SetState(SCE_ERLANG_STRING); break; + case '$' : sc.SetState(SCE_ERLANG_CHARACTER); break; + case '%' : { + parse_state = COMMENT; + sc.SetState(SCE_ERLANG_COMMENT); + } break; + case '#' : { + parse_state = RECORD_START; + sc.SetState(SCE_ERLANG_UNKNOWN); + } break; + case '?' : { + parse_state = MACRO_START; + sc.SetState(SCE_ERLANG_UNKNOWN); + } break; + case '\'' : { + parse_state = ATOM_QUOTED; + sc.SetState(SCE_ERLANG_UNKNOWN); + } break; + case '+' : + case '-' : { + if (IsADigit(sc.chNext)) { + parse_state = NUMERAL_START; + radix_digits = 0; + sc.SetState(SCE_ERLANG_UNKNOWN); + } else if (sc.ch != '+') { + parse_state = PREPROCESSOR; + sc.SetState(SCE_ERLANG_UNKNOWN); + } + } break; + default : no_new_state = true; + } + + if (no_new_state) { + if (isdigit(sc.ch)) { + parse_state = NUMERAL_START; + radix_digits = sc.ch - '0'; + sc.SetState(SCE_ERLANG_UNKNOWN); + } else if (isupper(sc.ch) || '_' == sc.ch) { + sc.SetState(SCE_ERLANG_VARIABLE); + } else if (isalpha(sc.ch)) { + parse_state = ATOM_UNQUOTED; + sc.SetState(SCE_ERLANG_UNKNOWN); + } else if (isoperator(static_cast<char>(sc.ch)) + || sc.ch == '\\') { + sc.SetState(SCE_ERLANG_OPERATOR); + } + } + } + + } + sc.Complete(); +} + +static int ClassifyErlangFoldPoint( + Accessor &styler, + int styleNext, + int keyword_start +) { + int lev = 0; + if (styler.Match(keyword_start,"case") + || ( + styler.Match(keyword_start,"fun") + && (SCE_ERLANG_FUNCTION_NAME != styleNext) + ) + || styler.Match(keyword_start,"if") + || styler.Match(keyword_start,"query") + || styler.Match(keyword_start,"receive") + ) { + ++lev; + } else if (styler.Match(keyword_start,"end")) { + --lev; + } + + return lev; +} + +static void FoldErlangDoc( + unsigned int startPos, int length, int initStyle, + WordList** /*keywordlists*/, Accessor &styler +) { + unsigned int endPos = startPos + length; + int currentLine = styler.GetLine(startPos); + int lev; + int previousLevel = styler.LevelAt(currentLine) & SC_FOLDLEVELNUMBERMASK; + int currentLevel = previousLevel; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + int stylePrev; + int keyword_start = 0; + char ch; + char chNext = styler.SafeGetCharAt(startPos); + bool atEOL; + + for (unsigned int i = startPos; i < endPos; i++) { + ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + + // Get styles + stylePrev = style; + style = styleNext; + styleNext = styler.StyleAt(i + 1); + atEOL = ((ch == '\r') && (chNext != '\n')) || (ch == '\n'); + + if (stylePrev != SCE_ERLANG_KEYWORD + && style == SCE_ERLANG_KEYWORD) { + keyword_start = i; + } + + // Fold on keywords + if (stylePrev == SCE_ERLANG_KEYWORD + && style != SCE_ERLANG_KEYWORD + && style != SCE_ERLANG_ATOM + ) { + currentLevel += ClassifyErlangFoldPoint(styler, + styleNext, + keyword_start); + } + + // Fold on comments + if (style == SCE_ERLANG_COMMENT + || style == SCE_ERLANG_COMMENT_MODULE + || style == SCE_ERLANG_COMMENT_FUNCTION) { + + if (ch == '%' && chNext == '{') { + currentLevel++; + } else if (ch == '%' && chNext == '}') { + currentLevel--; + } + } + + // Fold on braces + if (style == SCE_ERLANG_OPERATOR) { + if (ch == '{' || ch == '(' || ch == '[') { + currentLevel++; + } else if (ch == '}' || ch == ')' || ch == ']') { + currentLevel--; + } + } + + + if (atEOL) { + lev = previousLevel; + + if (currentLevel > previousLevel) + lev |= SC_FOLDLEVELHEADERFLAG; + + if (lev != styler.LevelAt(currentLine)) + styler.SetLevel(currentLine, lev); + + currentLine++; + previousLevel = currentLevel; + } + + } + + // Fill in the real level of the next line, keeping the current flags as they will be filled in later + styler.SetLevel(currentLine, + previousLevel + | (styler.LevelAt(currentLine) & ~SC_FOLDLEVELNUMBERMASK)); +} + +static const char * const erlangWordListDesc[] = { + "Erlang Reserved words", + "Erlang BIFs", + "Erlang Preprocessor", + "Erlang Module Attributes", + "Erlang Documentation", + "Erlang Documentation Macro", + 0 +}; + +LexerModule lmErlang( + SCLEX_ERLANG, + ColouriseErlangDoc, + "erlang", + FoldErlangDoc, + erlangWordListDesc); Property changes on: trunk/scintilla/LexErlang.cxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/scintilla/Makefile.am 2010-10-20 15:45:25 UTC (rev 5308) @@ -15,6 +15,7 @@ LexCmake.cxx \ LexCSS.cxx \ LexD.cxx \ +LexErlang.cxx \ LexForth.cxx \ LexFortran.cxx \ LexHaskell.cxx \ Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/scintilla/makefile.win32 2010-10-20 15:45:25 UTC (rev 5308) @@ -62,7 +62,7 @@ LEXOBJS=\ LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexHTML.o LexOthers.o LexPascal.o \ LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexTxt2tags.o LexRuby.o \ -LexForth.o LexFortran.o LexVHDL.o LexVerilog.o \ +LexErlang.o LexForth.o LexFortran.o LexVHDL.o LexVerilog.o \ LexMarkdown.o LexMatlab.o \ LexD.o LexLisp.o LexLua.o LexHaskell.o LexBasic.o LexR.o LexYAML.o LexCmake.o LexNsis.o #--Autogenerated -- end of automatically generated section Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/src/about.c 2010-10-20 15:45:25 UTC (rev 5308) @@ -98,7 +98,8 @@ "Mário Silva, Marko Peric, Matti Mårds, " "Moritz Barsnick, Ondrej Donek, Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, " "Robert McGinley, Roland Baudin, Ross McKay, S Jagannathan, Saleem Abdulrasool, " -"Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Thomas Huth, Thomas Martitz, Tomás Vírseda, " +"Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Taylor Venable, " +"Thomas Huth, Thomas Martitz, Tomás Vírseda, " "Tyler Mulligan, Walery Studennikov, Yura Siamashka"; Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/src/filetypes.c 2010-10-20 15:45:25 UTC (rev 5308) @@ -517,6 +517,17 @@ ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_SCRIPT; +#define ERLANG + ft = filetypes[GEANY_FILETYPES_ERLANG]; + ft->lang = -2; + ft->name = g_strdup("Erlang"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->extension = g_strdup("erl"); + ft->pattern = utils_strv_new("*.erl", NULL); + ft->comment_open = g_strdup("%"); + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; + #define CONF ft = filetypes[GEANY_FILETYPES_CONF]; ft->lang = 10; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/src/filetypes.h 2010-10-20 15:45:25 UTC (rev 5308) @@ -87,6 +87,7 @@ GEANY_FILETYPES_VERILOG, GEANY_FILETYPES_FORTH, GEANY_FILETYPES_LISP, + GEANY_FILETYPES_ERLANG, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/src/highlighting.c 2010-10-20 15:45:25 UTC (rev 5308) @@ -1137,6 +1137,88 @@ } +static void styleset_erlang_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_styleset(ft_id, 26); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "variable", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "atom", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "function_name", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "macro", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "record", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "preproc", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "node_name", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "comment_function", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "comment_module", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "comment_doc", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "comment_doc_macro", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "atom_quoted", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "macro_quoted", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "record_quoted", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "node_name_quoted", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "bifs", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "modules", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "modules_att", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "unknown", &style_sets[ft_id].styling[25]); + + style_sets[ft_id].keywords = g_new(gchar*, 6); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + get_keyfile_keywords(config, config_home, "bifs", ft_id, 1); + get_keyfile_keywords(config, config_home, "preproc", ft_id, 2); + get_keyfile_keywords(config, config_home, "module", ft_id, 3); + get_keyfile_keywords(config, config_home, "doc", ft_id, 4); + get_keyfile_keywords(config, config_home, "doc_macro", ft_id, 5); + style_sets[ft_id].keywords[6] = NULL; +} + + +static void styleset_erlang(ScintillaObject *sci, gint ft_id) +{ + apply_filetype_properties(sci, SCLEX_ERLANG, ft_id); + + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[4]); + sci_set_keywords(sci, 5, style_sets[ft_id].keywords[5]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_ERLANG_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_ERLANG_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_ERLANG_VARIABLE, ft_id, 2); + set_sci_style(sci, SCE_ERLANG_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_ERLANG_KEYWORD, ft_id, 4); + set_sci_style(sci, SCE_ERLANG_STRING, ft_id, 5); + set_sci_style(sci, SCE_ERLANG_OPERATOR, ft_id, 6); + set_sci_style(sci, SCE_ERLANG_ATOM, ft_id, 7); + set_sci_style(sci, SCE_ERLANG_FUNCTION_NAME, ft_id, 8); + set_sci_style(sci, SCE_ERLANG_CHARACTER, ft_id, 9); + set_sci_style(sci, SCE_ERLANG_MACRO, ft_id, 10); + set_sci_style(sci, SCE_ERLANG_RECORD, ft_id, 11); + set_sci_style(sci, SCE_ERLANG_PREPROC, ft_id, 12); + set_sci_style(sci, SCE_ERLANG_NODE_NAME, ft_id, 13); + set_sci_style(sci, SCE_ERLANG_COMMENT_FUNCTION, ft_id, 14); + set_sci_style(sci, SCE_ERLANG_COMMENT_MODULE, ft_id, 15); + set_sci_style(sci, SCE_ERLANG_COMMENT_DOC, ft_id, 16); + set_sci_style(sci, SCE_ERLANG_COMMENT_DOC_MACRO, ft_id, 17); + set_sci_style(sci, SCE_ERLANG_ATOM_QUOTED, ft_id, 18); + set_sci_style(sci, SCE_ERLANG_MACRO_QUOTED, ft_id, 19); + set_sci_style(sci, SCE_ERLANG_RECORD_QUOTED, ft_id, 20); + set_sci_style(sci, SCE_ERLANG_NODE_NAME_QUOTED, ft_id, 21); + set_sci_style(sci, SCE_ERLANG_BIFS, ft_id, 22); + set_sci_style(sci, SCE_ERLANG_MODULES, ft_id, 23); + set_sci_style(sci, SCE_ERLANG_MODULES_ATT, ft_id, 24); + set_sci_style(sci, SCE_ERLANG_UNKNOWN, ft_id, 25); +} + + static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_styleset(ft_id, 5); @@ -3326,6 +3408,7 @@ init_styleset_case(GEANY_FILETYPES_D, styleset_d_init); init_styleset_case(GEANY_FILETYPES_DIFF, styleset_diff_init); init_styleset_case(GEANY_FILETYPES_LISP, styleset_lisp_init); + init_styleset_case(GEANY_FILETYPES_ERLANG, styleset_erlang_init); init_styleset_case(GEANY_FILETYPES_DOCBOOK, styleset_docbook_init); init_styleset_case(GEANY_FILETYPES_FERITE, styleset_ferite_init); init_styleset_case(GEANY_FILETYPES_F77, styleset_f77_init); @@ -3397,6 +3480,7 @@ styleset_case(GEANY_FILETYPES_D, styleset_d); styleset_case(GEANY_FILETYPES_DIFF, styleset_diff); styleset_case(GEANY_FILETYPES_LISP, styleset_lisp); + styleset_case(GEANY_FILETYPES_ERLANG, styleset_erlang); styleset_case(GEANY_FILETYPES_DOCBOOK, styleset_docbook); styleset_case(GEANY_FILETYPES_FERITE, styleset_ferite); styleset_case(GEANY_FILETYPES_F77, styleset_f77); Modified: trunk/wscript =================================================================== --- trunk/wscript 2010-10-20 12:29:27 UTC (rev 5307) +++ trunk/wscript 2010-10-20 15:45:25 UTC (rev 5308) @@ -87,7 +87,7 @@ 'scintilla/KeyWords.cxx', 'scintilla/LexAda.cxx', 'scintilla/LexAsm.cxx', 'scintilla/LexBash.cxx', 'scintilla/LexBasic.cxx', 'scintilla/LexCaml.cxx', 'scintilla/LexCmake.cxx', 'scintilla/LexCPP.cxx', - 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx', 'scintilla/LexForth.cxx', + 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx', 'scintilla/LexErlang.cxx', 'scintilla/LexForth.cxx', 'scintilla/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx', 'scintilla/LexLisp.cxx', 'scintilla/LexLua.cxx', 'scintilla/LexMarkdown.cxx', 'scintilla/LexMatlab.cxx', 'scintilla/LexNsis.cxx', 'scintilla/LexOthers.cxx', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5307] trunk
by ntrel＠users.sourceforge.net 20 Oct '10

20 Oct '10

Revision: 5307 http://geany.svn.sourceforge.net/geany/?rev=5307&view=rev Author: ntrel Date: 2010-10-20 12:29:27 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Add alternative color scheme based on Python colors. Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/wscript Added Paths: ----------- trunk/data/colorschemes/ trunk/data/colorschemes/alt.conf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-20 12:11:07 UTC (rev 5306) +++ trunk/ChangeLog 2010-10-20 12:29:27 UTC (rev 5307) @@ -3,6 +3,8 @@ * src/highlighting.c: Use radio buttons for View->Editor->Color Schemes menu. Don't hide the menu when only the default item is available. + * data/colorschemes, data/colorschemes/alt.conf, wscript, Makefile.am: + Add alternative color scheme based on Python colors. 2010-10-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2010-10-20 12:11:07 UTC (rev 5306) +++ trunk/Makefile.am 2010-10-20 12:29:27 UTC (rev 5307) @@ -25,7 +25,8 @@ data/snippets.conf \ data/ui_toolbar.xml \ $(srcdir)/data/templates/* \ - $(srcdir)/data/templates/files/* + $(srcdir)/data/templates/files/* \ + $(srcdir)/data/colorschemes/* EXTRA_DIST = \ autogen.sh \ @@ -77,6 +78,12 @@ $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/templates/files/; \ fi \ done + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/colorschemes; + for file in $(srcdir)/data/colorschemes/*; do \ + if test -f $$file; then \ + $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/colorschemes/; \ + fi \ + done BZIP2_ENV =--best Added: trunk/data/colorschemes/alt.conf =================================================================== --- trunk/data/colorschemes/alt.conf (rev 0) +++ trunk/data/colorschemes/alt.conf 2010-10-20 12:29:27 UTC (rev 5307) @@ -0,0 +1,24 @@ +# Set of styles like the Geany <= 0.19 Python/script defaults with gray comments. + +[named_styles] +# style names to use in filetypes.* [styling] sections +# use foreground;background;bold;italic +# normally background should be left blank to use the "default" style + +default=0x000000;0xffffff +comment=0x808080 +commentdoc=0x404000 +number=0x400080 +# keyword +word=0x600080;;true +# e.g. global types from a *.c.tags file +word2=0x9f0200;;true +string=0x008000 +preprocessor=0x007f7f +operator=0x300080 +# unterminated string +stringeol=0x000000;0xe0c0e0 +type=0x0000d0;;true + + + Property changes on: trunk/data/colorschemes/alt.conf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/wscript =================================================================== --- trunk/wscript 2010-10-20 12:11:07 UTC (rev 5306) +++ trunk/wscript 2010-10-20 12:29:27 UTC (rev 5307) @@ -525,6 +525,7 @@ bld.install_files('${DATADIR}/%s' % dir, 'data/ui_toolbar.xml') bld.install_files('${DATADIR}/%s/templates' % dir, 'data/templates/*.*') bld.install_files('${DATADIR}/%s/templates/files' % dir, 'data/templates/files/*.*') + bld.install_files('${DATADIR}/%s/colorschemes' % dir, 'data/colorschemes/*.*') bld.install_as('${DATADIR}/%s/GPL-2' % dir, 'COPYING') # Icons bld.install_files('${PREFIX}/share/icons' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5306] trunk/HACKING
by ntrel＠users.sourceforge.net 20 Oct '10

20 Oct '10

Revision: 5306 http://geany.svn.sourceforge.net/geany/?rev=5306&view=rev Author: ntrel Date: 2010-10-20 12:11:07 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Add 3 bugs to watch out for. Modified Paths: -------------- trunk/HACKING Modified: trunk/HACKING =================================================================== --- trunk/HACKING 2010-10-20 11:49:50 UTC (rev 5305) +++ trunk/HACKING 2010-10-20 12:11:07 UTC (rev 5306) @@ -254,8 +254,11 @@ --------------------- * Forgetting to check *doc->is_valid* when looping through *documents_array* - instead use *foreach_document()*. +* Inserting fields into structs in the plugin API instead of appending. * Not breaking the plugin ABI when necessary. * Using an idle callback that doesn't check main_status.quitting. +* Forgetting CRLF line endings on Windows. +* Not handling Tabs/Spaces indent mode. Libraries --------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010