diff --git a/ChangeLog b/ChangeLog index 2eecdd48..e78a6ec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,9 +4,12 @@ scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, data/filetypes.txt2tags, wscript: - Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632). + Add lexer for Txt2Tags (patch by Forgeot Eric, thanks - #3020632). * m4, m4/intltool.m4, configure.ac, Makefile.am: Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). + * src/callbacks.c: + Only prompt for reloading if the document has unsaved changes + (patch by Jiří Techet, thanks). 2010-08-21 Frank Lanitz diff --git a/src/callbacks.c b/src/callbacks.c index cd6e53ee..f9735705 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -485,7 +485,8 @@ on_reload_as_activate (GtkMenuItem *menuitem, charset = doc->encoding; base_name = g_path_get_basename(doc->file_name); - if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, + if (!doc->changed || + dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, _("Any unsaved changes will be lost."), _("Are you sure you want to reload '%s'?"), base_name)) {