Index: intltool-merge.in.in
===================================================================
RCS file: /cvs/gnome/intltool/intltool-merge.in.in,v
retrieving revision 1.74
diff -u -p -r1.74 intltool-merge.in.in
--- intltool-merge.in.in	11 Nov 2003 19:19:05 -0000	1.74
+++ intltool-merge.in.in	18 Nov 2003 15:46:24 -0000
@@ -46,7 +46,6 @@ if(!$ret) {
     die "You must have XML::Parser installed to run $0\n\n";
 } 
 
-#use vars qw($must_end_tag, $last_depth, $translation_depth, @tag_stack, @entered_tag);
 my $must_end_tag      = -1;
 my $last_depth        = -1;
 my $translation_depth = -1;
@@ -688,7 +687,7 @@ sub parseTree
 
                     if ($MULTIPLE_OUTPUT && $lang ne "$language") {
                         next;
-		    }
+                    }
 
                     print $fh " " x ($depth * $indent), "<", $current_tag, " xml:lang=\"", $lang, "\"";
                     $must_end_tag = $depth;
@@ -812,7 +811,7 @@ sub parseTree
                 $string =~ s/\s+/ /g;
                 $string =~ s/^ //;
                 $string =~ s/ $//;
-                $string = entity_decode($string);
+#               $string = entity_decode($string);
 
                 # Display CDATA
                 #
@@ -840,7 +839,7 @@ sub readXml
         die "ERROR Cannot find filename: $filename\n";
     }
 
-    my $xp = new XML::Parser(Style => 'Tree');
+    my $xp = new XML::Parser(Style => 'OrigTree');
     my $tree = $xp->parsefile($filename);
 
 # <foo><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
