Make treatment of obsolete header entries consistent.

diff --git a/src/ChangeLog b/src/ChangeLog
index ed20e9e8a7b134cf121a13961ac4e9485995fa55..0f6cef8e25b4b47a183f6d157af7acb52982208c 100644 (file)
--- 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 f8ea286934364d9b594056e5ef8f1351f0df528d..58488183a20751235d94e6292eca4026658ed73b 100644 (file)
--- 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,