Fix invalid filetype setting when using Save All and files with filetype None (thanks to Omair Eshkenazi for reporting).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1817 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2007-08-23 17:59:22 +00:00
parent 52e8b9f27d
commit 7b14228f62
2 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2007-08-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/document.c: Fix invalid filetype setting when using Save All and
files with filetype None (thanks to Omair Eshkenazi
for reporting).
2007-08-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* plugins/export.c, src/templates.c, src/build.c, src/utils.c,

View File

@ -1023,7 +1023,7 @@ gboolean document_save_file(gint idx, gboolean force)
if (editor_prefs.trail_space) document_strip_trailing_spaces(idx);
// ensure the file has a newline at the end
if (editor_prefs.new_line) document_ensure_final_newline(idx);
// ensure there a really the same EOL chars
// ensure there are really the same EOL chars
sci_convert_eols(doc_list[idx].sci, sci_get_eol_mode(doc_list[idx].sci));
len = sci_get_length(doc_list[idx].sci) + 1;
@ -1124,7 +1124,12 @@ gboolean document_save_file(gint idx, gboolean force)
if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_ALL)
{
doc_list[idx].file_type = filetypes_detect_from_file(idx);
filetypes_select_radio_item(doc_list[idx].file_type);
if (document_get_cur_idx() == idx)
{
app->ignore_callback = TRUE;
filetypes_select_radio_item(doc_list[idx].file_type);
app->ignore_callback = FALSE;
}
}
document_set_filetype(idx, doc_list[idx].file_type);
tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE);