Revision: 1189 http://svn.sourceforge.net/geany/?rev=1189&view=rev Author: eht16 Date: 2007-01-14 09:46:39 -0800 (Sun, 14 Jan 2007)
Log Message: ----------- jsp is a Java extension.
Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/src/filetypes.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-14 17:36:42 UTC (rev 1188) +++ trunk/ChangeLog 2007-01-14 17:46:39 UTC (rev 1189) @@ -12,6 +12,8 @@ * src/about.c: Updated copyright information. * geany_private.rc, README, src/*.c, src/*.h: Updated copyright information. + * data/filetype_extensions.conf, src/filetypes.c: + jsp is a Java extension.
2007-01-14 Nick Treleaven nick.treleaven@btinternet.com
Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2007-01-14 17:36:42 UTC (rev 1188) +++ trunk/data/filetype_extensions.conf 2007-01-14 17:46:39 UTC (rev 1189) @@ -5,14 +5,14 @@ C=*.c;*.h; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; D=*.d;*.di; -Java=*.java; +Java=*.java;*.jsp; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; ASM=*.asm; Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95; CAML=*.ml;*.mli; Perl=*.pl;*.perl;*.pm;*.agi; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; -Javascript=*.js;*.jsp; +Javascript=*.js; Python=*.py;*.pyw; Ruby=*.rb;*.rhtml; Tcl=*.tcl;*.tk;*.wish;
Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-01-14 17:36:42 UTC (rev 1188) +++ trunk/src/filetypes.c 2007-01-14 17:46:39 UTC (rev 1189) @@ -203,9 +203,10 @@ filetypes[GEANY_FILETYPES_JAVA]->has_tags = TRUE; filetypes[GEANY_FILETYPES_JAVA]->title = g_strdup(_("Java source file")); filetypes[GEANY_FILETYPES_JAVA]->extension = g_strdup("java"); - filetypes[GEANY_FILETYPES_JAVA]->pattern = g_new0(gchar*, 2); + filetypes[GEANY_FILETYPES_JAVA]->pattern = g_new0(gchar*, 3); filetypes[GEANY_FILETYPES_JAVA]->pattern[0] = g_strdup("*.java"); - filetypes[GEANY_FILETYPES_JAVA]->pattern[1] = NULL; + filetypes[GEANY_FILETYPES_JAVA]->pattern[1] = g_strdup("*.jsp"); + filetypes[GEANY_FILETYPES_JAVA]->pattern[2] = NULL; filetypes[GEANY_FILETYPES_JAVA]->comment_open = g_strdup("/*"); filetypes[GEANY_FILETYPES_JAVA]->comment_close = g_strdup("*/"); filetypes[GEANY_FILETYPES_JAVA]->style_func_ptr = styleset_java; @@ -353,10 +354,9 @@ filetypes[GEANY_FILETYPES_JS]->has_tags = TRUE; filetypes[GEANY_FILETYPES_JS]->title = g_strdup(_("Javascript source file")); filetypes[GEANY_FILETYPES_JS]->extension = g_strdup("js"); - filetypes[GEANY_FILETYPES_JS]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_JS]->pattern = g_new0(gchar*, 2); filetypes[GEANY_FILETYPES_JS]->pattern[0] = g_strdup("*.js"); - filetypes[GEANY_FILETYPES_JS]->pattern[1] = g_strdup("*.jsp"); /// TODO what is jsp actually? - filetypes[GEANY_FILETYPES_JS]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_JS]->pattern[1] = NULL; filetypes[GEANY_FILETYPES_JS]->style_func_ptr = styleset_js; filetypes[GEANY_FILETYPES_JS]->comment_open = g_strdup("//"); filetypes[GEANY_FILETYPES_JS]->comment_close = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.