Revision: 490 Author: eht16 Date: 2006-06-26 09:22:37 -0700 (Mon, 26 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=490&view=rev

Log Message: ----------- Add mk pattern for Makefile.

Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/tagmanager/make.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-26 16:19:28 UTC (rev 489) +++ trunk/ChangeLog 2006-06-26 16:22:37 UTC (rev 490) @@ -4,6 +4,7 @@ * src/document.c: Reload also the symbol list when reloading a file. * src/treeviews.c: Changed some titles to plural. Added own definitions for filetype Python. + * src/filetypes.c, tagmanager/make.c: Add mk pattern for Makefile.

2006-06-26 Nick Treleaven nick.treleaven@btinternet.com

Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-06-26 16:19:28 UTC (rev 489) +++ trunk/src/filetypes.c 2006-06-26 16:22:37 UTC (rev 490) @@ -277,10 +277,11 @@ filetypes[GEANY_FILETYPES_MAKE]->has_tags = TRUE; filetypes[GEANY_FILETYPES_MAKE]->title = g_strdup(_("Makefile")); filetypes[GEANY_FILETYPES_MAKE]->extension = g_strdup("mak"); - filetypes[GEANY_FILETYPES_MAKE]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_MAKE]->pattern = g_new0(gchar*, 4); filetypes[GEANY_FILETYPES_MAKE]->pattern[0] = g_strdup("*.mak"); - filetypes[GEANY_FILETYPES_MAKE]->pattern[1] = g_strdup("Makefile*"); - filetypes[GEANY_FILETYPES_MAKE]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_MAKE]->pattern[1] = g_strdup("*.mk"); + filetypes[GEANY_FILETYPES_MAKE]->pattern[2] = g_strdup("Makefile*"); + filetypes[GEANY_FILETYPES_MAKE]->pattern[3] = NULL; filetypes[GEANY_FILETYPES_MAKE]->style_func_ptr = styleset_makefile; filetypes[GEANY_FILETYPES_MAKE]->comment_open = g_strdup("#"); filetypes[GEANY_FILETYPES_MAKE]->comment_close = NULL;

Modified: trunk/tagmanager/make.c =================================================================== --- trunk/tagmanager/make.c 2006-06-26 16:19:28 UTC (rev 489) +++ trunk/tagmanager/make.c 2006-06-26 16:22:37 UTC (rev 490) @@ -89,7 +89,7 @@ extern parserDefinition* MakefileParser (void) { static const char *const patterns [] = { "[Mm]akefile", NULL }; - static const char *const extensions [] = { "mak", NULL }; + static const char *const extensions [] = { "mak", "mk", NULL }; parserDefinition* const def = parserNew ("Make"); def->kinds = MakeKinds; def->kindCount = KIND_COUNT (MakeKinds);

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