SF.net SVN: geany: [660] trunk

[ntrel at users.sourceforge.net]

Revision: 660
Author:   ntrel
Date:     2006-08-01 13:07:58 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=660&view=rev

Log Message:
-----------
Add Make pattern to recognise makefile*

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetype_extensions.conf
    trunk/src/filetypes.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-01 16:12:45 UTC (rev 659)
+++ trunk/ChangeLog	2006-08-01 20:07:58 UTC (rev 660)
@@ -21,6 +21,8 @@
    Apply the tab width setting for new documents.
  * src/keyfile.c, data/filetype_extensions.conf, Makefile.am:
    Install a system filetype_extensions.conf which can be overridden.
+ * src/filetypes.c data/filetype_extensions.conf:
+   Add Make pattern to recognise makefile*.
 
 
 2006-07-31  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/data/filetype_extensions.conf
===================================================================
--- trunk/data/filetype_extensions.conf	2006-08-01 16:12:45 UTC (rev 659)
+++ trunk/data/filetype_extensions.conf	2006-08-01 20:07:58 UTC (rev 660)
@@ -15,7 +15,7 @@
 Ruby=*.rb;*.rhtml;
 Tcl=*.tcl;*.tk;*.wish;
 Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;
-Make=*.mak;*.mk;Makefile*;
+Make=*.mak;*.mk;Makefile*;makefile*;
 XML=*.xml;*.sgml;
 Docbook=*.docbook;
 CSS=*.css;

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2006-08-01 16:12:45 UTC (rev 659)
+++ trunk/src/filetypes.c	2006-08-01 20:07:58 UTC (rev 660)
@@ -314,11 +314,10 @@
 	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*, 4);
-	filetypes[GEANY_FILETYPES_MAKE]->pattern[0] = g_strdup("*.mak");
-	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;
+	{
+		gchar *pattern_make[] = {"*.mak", "*.mk", "Makefile*", "makefile*", NULL};
+		filetypes[GEANY_FILETYPES_MAKE]->pattern = g_strdupv(pattern_make);
+	}
 	filetypes[GEANY_FILETYPES_MAKE]->style_func_ptr = styleset_makefile;
 	filetypes[GEANY_FILETYPES_MAKE]->comment_open = g_strdup("#");
 	filetypes[GEANY_FILETYPES_MAKE]->comment_close = NULL;


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