SF.net SVN: geany:[4223] trunk

[eht16 at users.sourceforge.net]

Revision: 4223
          http://geany.svn.sourceforge.net/geany/?rev=4223&view=rev
Author:   eht16
Date:     2009-09-21 20:48:50 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
When reloading files, use the previously set encoding instead of detecting it again (closes #2862041).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/document.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-21 20:31:39 UTC (rev 4222)
+++ trunk/ChangeLog	2009-09-21 20:48:50 UTC (rev 4223)
@@ -2,6 +2,9 @@
 
  * src/build.c:
    Fix compiler warnings about uninitialised variables.
+ * src/callbacks.c, src/document.c:
+   When reloading files, use the previously set encoding instead of
+   detecting it again (closes #2862041).
 
 
 2009-09-21  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2009-09-21 20:31:39 UTC (rev 4222)
+++ trunk/src/callbacks.c	2009-09-21 20:48:50 UTC (rev 4223)
@@ -464,6 +464,8 @@
 			return;
 		charset = encodings[i].charset;
 	}
+	else
+		charset = doc->encoding;
 
 	base_name = g_path_get_basename(doc->file_name);
 	if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL,

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2009-09-21 20:31:39 UTC (rev 4222)
+++ trunk/src/document.c	2009-09-21 20:48:50 UTC (rev 4223)
@@ -2913,7 +2913,7 @@
 		base_name);
 
 	if (want_reload)
-		document_reload_file(doc, NULL);
+		document_reload_file(doc, doc->encoding);
 
 	g_free(base_name);
 	return want_reload;


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