InstantSave: when opening new files from template, use the template's filetype,…

InstantSave: when opening new files from template, use the template's filetype, otherwise fall back to configured default filetype.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3072 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -3,6 +3,9 @@
  * src/highlighting.c:
    Fix regression: clear all styles for filetype None to not break
    the 'invert_all' option.
+ * src/saveactions.c:
+   InstantSave: when opening new files from template, use the template's
+   filetype, otherwise fall back to configured default filetype.
 
 
 2008-10-12  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

plugins/saveactions.c

@@ -254,12 +254,17 @@ static void instantsave_document_new_cb(GObject *obj, GeanyDocument *doc, gpoint
     {
 		gchar *new_filename;
 		gint fd;
-		GeanyFiletype *ft = p_filetypes->lookup_by_name(instantsave_default_ft);
+		GeanyFiletype *ft = doc->file_type;
 
 		fd = g_file_open_tmp("gis_XXXXXX", &new_filename, NULL);
 		if (fd != -1)
 			close(fd); /* close the returned file descriptor as we only need the filename */
 
+		if (ft == NULL)
+			/* ft is NULL when a new file without template was opened, so use the
+			 * configured default file type */
+			ft = p_filetypes->lookup_by_name(instantsave_default_ft);
+
 		if (ft != NULL)
 			/* add the filetype's default extension to the new filename */
 			setptr(new_filename, g_strconcat(new_filename, ".", ft->extension, NULL));