changeset 1325:b93b39fb30c9

correctly save and restore overlay string

--- a/src/rcfile.c	Wed Feb 25 20:54:38 2009 +0000
+++ b/src/rcfile.c	Wed Feb 25 21:09:17 2009 +0000
@@ -47,10 +47,30 @@
 
 void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text)
 {
-	gchar *escval = g_markup_escape_text(text ? text : "", -1);
+	/* this is needed for overlay string, because g_markup_escape_text does not handle \n and such, 
+	   ideas for improvement are welcome
+	*/
+	static const unsigned char no_quote_utf[] = {
+		0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b,
+		0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+		0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3,
+		0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+		0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
+		0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+		0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3,
+		0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+		0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
+		0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+		'"',  0 /* '"' is handled in g_markup_escape_text */
+	};
+
+	gchar *escval1 = g_strescape(text ? text : "", no_quote_utf); 
+	gchar *escval2 = g_markup_escape_text(escval1, -1);
 	write_indent(str, indent);
-	g_string_append_printf(str, "%s = \"%s\"\n", label, escval);
-	g_free(escval);
+	g_string_append_printf(str, "%s = \"%s\"\n", label, escval2);
+	g_free(escval2);
+	g_free(escval1);
 }
 
 gboolean read_char_option(const gchar *option, const gchar *label, const gchar *value, gchar **text)
@@ -59,7 +79,7 @@
 	if (!text) return FALSE;
 
 	g_free(*text);
-	*text = g_strdup(value);
+	*text = g_strcompress(value);
 	return TRUE;
 }