SF.net SVN: geany: [1571] trunk

[eht16 at users.sourceforge.net]

Revision: 1571
          http://svn.sourceforge.net/geany/?rev=1571&view=rev
Author:   eht16
Date:     2007-05-25 06:08:17 -0700 (Fri, 25 May 2007)

Log Message:
-----------
Add *.ash and *.bash as filetype entensions for filetype SH.
Add ash and wish to the shebang patterns.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-25 12:03:35 UTC (rev 1570)
+++ trunk/ChangeLog	2007-05-25 13:08:17 UTC (rev 1571)
@@ -1,3 +1,10 @@
+2007-05-25  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * data/filetype_extensions.conf, src/filetypes.c, tagmanager/sh.c:
+   Add *.ash and *.bash as filetype entensions for filetype SH.
+   Add ash and wish to the shebang patterns.
+
+
 2007-05-25  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * doc/geany.docbook:

Modified: trunk/data/filetype_extensions.conf
===================================================================
--- trunk/data/filetype_extensions.conf	2007-05-25 12:03:35 UTC (rev 1570)
+++ trunk/data/filetype_extensions.conf	2007-05-25 13:08:17 UTC (rev 1571)
@@ -18,7 +18,7 @@
 Tcl=*.tcl;*.tk;*.wish;
 Lua=*.lua;
 Ferite=*.fe;
-Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;
+Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;
 Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
 XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;
 Docbook=*.docbook;

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2007-05-25 12:03:35 UTC (rev 1570)
+++ trunk/src/filetypes.c	2007-05-25 13:08:17 UTC (rev 1571)
@@ -367,7 +367,7 @@
 	filetypes[GEANY_FILETYPES_SH]->title = g_strdup(_("Shell script file"));
 	filetypes[GEANY_FILETYPES_SH]->extension = g_strdup("sh");
 	filetypes[GEANY_FILETYPES_SH]->pattern = utils_strv_new("*.sh", "configure", "configure.in",
-		"configure.in.in", "configure.ac", "*.ksh", "*.zsh", NULL);
+		"configure.in.in", "configure.ac", "*.ksh", "*.zsh", "*.ash", "*.bash", NULL);
 	filetypes[GEANY_FILETYPES_SH]->style_func_ptr = styleset_sh;
 	filetypes[GEANY_FILETYPES_SH]->comment_open = g_strdup("#");
 	filetypes[GEANY_FILETYPES_SH]->comment_close = NULL;
@@ -599,8 +599,12 @@
 			ft = filetypes[GEANY_FILETYPES_SH];
 		else if (strncmp(basename_interpreter, "csh", 3) == 0)
 			ft = filetypes[GEANY_FILETYPES_SH];
+		else if (strncmp(basename_interpreter, "ash", 3) == 0)
+			ft = filetypes[GEANY_FILETYPES_SH];
 		else if (strncmp(basename_interpreter, "dmd", 3) == 0)
 			ft = filetypes[GEANY_FILETYPES_D];
+		else if (strncmp(basename_interpreter, "wish", 4) == 0)
+			ft = filetypes[GEANY_FILETYPES_TCL];
 		// what else to add?
 
 		g_free(basename_interpreter);

Modified: trunk/tagmanager/sh.c
===================================================================
--- trunk/tagmanager/sh.c	2007-05-25 12:03:35 UTC (rev 1570)
+++ trunk/tagmanager/sh.c	2007-05-25 13:08:17 UTC (rev 1571)
@@ -101,7 +101,7 @@
 extern parserDefinition* ShParser (void)
 {
     static const char *const extensions [] = {
-	"sh", "SH", "bsh", "bash", "ksh", "zsh", NULL
+	"sh", "SH", "bsh", "bash", "ksh", "zsh", "ash", NULL
     };
     parserDefinition* def = parserNew ("Sh");
     def->kinds      = ShKinds;


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