From: Bruno Haible <bruno@clisp.org>
Date: Tue, 20 Nov 2001 14:48:53 +0000 (+0000)
Subject: Make treatment of obsolete header entries consistent.
X-Git-Tag: v0.11~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7fc80c13db4cd110fcae48a154e67c530d245a3;p=thirdparty%2Fgettext.git

Make treatment of obsolete header entries consistent.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ed20e9e8a..0f6cef8e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-17  Bruno Haible  <haible@clisp.cons.org>
+
+	* po.c (po_callback_message): Ignore obsolete header entries, for
+	consistency with msgdomain_list_print(), compare_po_locale_charsets(),
+	iconv_message_list(), catenate_msgdomain_list().
+
 2001-11-17  Bruno Haible  <haible@clisp.cons.org>
 
 	* msgfmt.c (struct msg_domain): Remove symbol_tab field.
diff --git a/src/po.c b/src/po.c
index f8ea28693..58488183a 100644
--- a/src/po.c
+++ b/src/po.c
@@ -197,7 +197,7 @@ po_callback_message (msgid, msgid_pos, msgid_plural,
   /* assert(callback_arg); */
 
   /* Test for header entry.  Ignore fuzziness of the header entry.  */
-  if (msgid[0] == '\0')
+  if (msgid[0] == '\0' && !obsolete)
     po_lex_charset_set (msgstr, gram_pos.file_name);
 
   po_directive_message (callback_arg, msgid, msgid_pos, msgid_plural,