SF.net SVN: geany: [967] trunk

[ntrel at users.sourceforge.net]

Revision: 967
          http://svn.sourceforge.net/geany/?rev=967&view=rev
Author:   ntrel
Date:     2006-11-04 04:49:55 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
Recognise *.xsl, *.xslt filenames for XML filetype.
Recognise 'GNUmakefile' filename for Make filetype.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetype_extensions.conf
    trunk/src/filetypes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-04 12:49:00 UTC (rev 966)
+++ trunk/ChangeLog	2006-11-04 12:49:55 UTC (rev 967)
@@ -1,8 +1,14 @@
 2006-11-04  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/search.c: Fix pressing enter to search from the Find dialog.
+ * src/keyfile.c, src/keyfile.h, src/main.c:
+   Make filetype_extensions.conf generation only available with a debug
+   build of Geany.
+ * src/filetypes.c, data/filetype_extensions.conf:
+   Recognise *.xsl, *.xslt filenames for XML filetype.
+   Recognise 'GNUmakefile' filename for Make filetype.
+ 
 
-
 2006-11-03  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/msgwindow.c:

Modified: trunk/data/filetype_extensions.conf
===================================================================
--- trunk/data/filetype_extensions.conf	2006-11-04 12:49:00 UTC (rev 966)
+++ trunk/data/filetype_extensions.conf	2006-11-04 12:49:55 UTC (rev 967)
@@ -8,24 +8,23 @@
 Java=*.java;
 Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;
 ASM=*.asm;
-Fortran=*.f;*.f77;*.f90;*.f95;*.for;*.ftn;
-Ferite=*.fe;
+Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95;
 CAML=*.ml;*.mli;
 Perl=*.pl;*.perl;*.pm;*.agi;
 PHP=*.php;*.php3;*.php4;*.php5;*.phtml;
 Python=*.py;*.pyw;
 Ruby=*.rb;*.rhtml;
 Tcl=*.tcl;*.tk;*.wish;
+Ferite=*.fe;
 Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;
-Make=*.mak;*.mk;Makefile*;makefile*;
-XML=*.xml;*.sgml;
+Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
+XML=*.xml;*.sgml;*.xsl;*.xslt;
 Docbook=*.docbook;
 HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;
 CSS=*.css;
 SQL=*.sql;
 LaTeX=*.tex;*.sty;*.idx;
 O-Matrix=*.oms;
-Conf=*.conf;*.ini;config;*rc;*.cfg;
 Diff=*.diff;*.patch;
+Conf=*.conf;*.ini;config;*rc;*.cfg;
 None=*;
-

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2006-11-04 12:49:00 UTC (rev 966)
+++ trunk/src/filetypes.c	2006-11-04 12:49:55 UTC (rev 967)
@@ -452,8 +452,9 @@
 	filetypes[GEANY_FILETYPES_MAKE]->title = g_strdup(_("Makefile"));
 	filetypes[GEANY_FILETYPES_MAKE]->extension = g_strdup("mak");
 	{
-		gchar *pattern_make[] = {"*.mak", "*.mk", "Makefile*", "makefile*", NULL};
-		filetypes[GEANY_FILETYPES_MAKE]->pattern = g_strdupv(pattern_make);
+		gchar *patterns[] = {"*.mak", "*.mk", "GNUmakefile", "makefile", "Makefile",
+			"makefile.*", "Makefile.*", NULL};
+		filetypes[GEANY_FILETYPES_MAKE]->pattern = g_strdupv(patterns);
 	}
 	filetypes[GEANY_FILETYPES_MAKE]->style_func_ptr = styleset_makefile;
 	filetypes[GEANY_FILETYPES_MAKE]->comment_open = g_strdup("#");
@@ -471,10 +472,10 @@
 	filetypes[GEANY_FILETYPES_XML]->has_tags = FALSE;
 	filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML source file"));
 	filetypes[GEANY_FILETYPES_XML]->extension = g_strdup("xml");
-	filetypes[GEANY_FILETYPES_XML]->pattern = g_new0(gchar*, 3);
-	filetypes[GEANY_FILETYPES_XML]->pattern[0] = g_strdup("*.xml");
-	filetypes[GEANY_FILETYPES_XML]->pattern[1] = g_strdup("*.sgml");
-	filetypes[GEANY_FILETYPES_XML]->pattern[2] = NULL;
+	{
+		gchar *patterns[] = {"*.xml", "*.sgml", "*.xsl", "*.xslt", NULL};
+		filetypes[GEANY_FILETYPES_XML]->pattern = g_strdupv(patterns);
+	}
 	filetypes[GEANY_FILETYPES_XML]->style_func_ptr = styleset_xml;
 	filetypes[GEANY_FILETYPES_XML]->comment_open = g_strdup("<!--");
 	filetypes[GEANY_FILETYPES_XML]->comment_close = g_strdup("-->");


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