Merge commit '94f084324e648876508bed546d950762f10b875e'

* commit '94f084324e648876508bed546d950762f10b875e': texi2pod: Make it output a single encoding string Conflicts: doc/texi2pod.pl See: 12ce58bebd Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 4d13d440ee
parent eacf42dd50 94f084324e
commit 4d13d440ee
1 changed files with 3 additions and 3 deletions
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@ -332,12 +332,12 @@ $inf = pop @instack;

 die "No filename or title\n" unless defined $fn && defined $tl;

-$chapters{NAME} = "$fn \- $tl\n";
-$chapters{FOOTNOTES} .= "=back\n" if exists $chapters{FOOTNOTES};
-
 # always use utf8
 print "=encoding utf8\n\n";

+$chapters{NAME} = "$fn \- $tl\n";
+$chapters{FOOTNOTES} .= "=back\n" if exists $chapters{FOOTNOTES};
+
 unshift @chapters_sequence, "NAME";
 for $chapter (@chapters_sequence) {
    if (exists $chapters{$chapter}) {