[Po4a-commits] "po4a changelog,1.443,1.444 po4a,1.84,1.85"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a
In directory alioth:/tmp/cvs-serv11038

Modified Files:
	changelog po4a 
Log Message:
	* po4a: Fix the handling of global options in the configuration
	file. [options] opt:"-M UTF-8" failed.


Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- po4a	10 Feb 2009 21:07:58 -0000	1.84
+++ po4a	22 Feb 2009 10:17:24 -0000	1.85
@@ -767,9 +767,13 @@
 	my %options;
 	my $o = $line;
 	$o =~ s/.*?\[options\] +//;
+	if (defined $document{''}{"options"}) {
+		%options = %{$document{''}{"options"}};
+	}
 	parse_config_options("$config_file:$nb",
 	                     $o,
-	                     $document{''}{"options"});
+	                     \%options);
+	%{$document{''}{"options"}} = %options;
     } else {
 	die wrap_ref_mod("$config_file:$nb", "",
 	    gettext("Unparsable command '%s'."), $cmd);

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -d -r1.443 -r1.444
--- changelog	22 Feb 2009 10:13:28 -0000	1.443
+++ changelog	22 Feb 2009 10:17:24 -0000	1.444
@@ -1,5 +1,10 @@
 2009-02-22  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* po4a: Fix the handling of global options in the configuration
+	file. [options] opt:"-M UTF-8" failed.
+
+2009-02-22  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* lib/Locale/Po4a/Xml.pm: Check that the translated and
 	untranslated lists are exclusive.
 	* lib/Locale/Po4a/Xml.pm: Check that the break, inline and