SF.net SVN: geany:[4604] branches/geany-0.18.1

[eht16 at users.sourceforge.net]

Revision: 4604
          http://geany.svn.sourceforge.net/geany/?rev=4604&view=rev
Author:   eht16
Date:     2010-01-31 16:23:47 +0000 (Sun, 31 Jan 2010)

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

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/src/callbacks.c
    branches/geany-0.18.1/src/document.c

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-01-31 16:23:31 UTC (rev 4603)
+++ branches/geany-0.18.1/ChangeLog	2010-01-31 16:23:47 UTC (rev 4604)
@@ -71,6 +71,13 @@
    Minor edits.
 
 
+2009-09-21  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * 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>
 
  * src/utils.c:

Modified: branches/geany-0.18.1/src/callbacks.c
===================================================================
--- branches/geany-0.18.1/src/callbacks.c	2010-01-31 16:23:31 UTC (rev 4603)
+++ branches/geany-0.18.1/src/callbacks.c	2010-01-31 16:23:47 UTC (rev 4604)
@@ -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: branches/geany-0.18.1/src/document.c
===================================================================
--- branches/geany-0.18.1/src/document.c	2010-01-31 16:23:31 UTC (rev 4603)
+++ branches/geany-0.18.1/src/document.c	2010-01-31 16:23:47 UTC (rev 4604)
@@ -2870,7 +2870,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.