Handling of obsolete messages in POT file.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 75ab8448e8177156724c7b8264bec98837f9caf8..93655db1b7fd43ba61aaf5eab74409a2433611ea 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-07  Bruno Haible  <bruno@clisp.org>
+
+       * msgmerge.c (message_merge): Copy the obsolete bit from the ref
+       message.
+       Reported by Leonardo Fontenelle <leo.fontenelle@gmail.com>.
+
 2006-12-24  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (AM_CXXFLAGS): New variable.

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index ad12d3774b7513da319e452c3598035d279e2499..03a67273101e1dec253812d31cbfa61f40bf06e8 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
    This program is free software; you can redistribute it and/or modify
@@ -1073,6 +1073,12 @@ message_merge (message_ty *def, message_ty *ref, bool force_fuzzy)
       result->prev_msgid_plural = prev_msgid_plural;
     }
 
+  /* If the reference message was obsolete, make the resulting message
+     obsolete.  This case doesn't occur for POT files, but users sometimes
+     use PO files that are themselves the result of msgmerge instead of POT
+     files.  */
+  result->obsolete = ref->obsolete;
+
   /* Take the file position comments from the reference file, as they
      are generated by xgettext.  Any in the definition file are old ones
      collected by previous runs of xgettext and msgmerge.  */

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f8ba4ee1c6d32f55a0bea116807e51826ad37bb1..85e5e7a1b016e7aae570b6160f5209c03959bc79 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-07  Bruno Haible  <bruno@clisp.org>
+
+       * msgmerge-20: New file.
+       * Makefile.am (TESTS): Add it.
+       Reported by Leonardo Fontenelle <leo.fontenelle@gmail.com>.
+
 2006-12-16  Bruno Haible  <bruno@clisp.org>
 
        Make it work with autoconf > 2.61.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 595d9bc0be8d837eabc5e0cb1687fa57d40220a6..ae9e9541e270d3e740e72f7b4012d3ca7dd6f8d8 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/tests subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2006 Free Software Foundation, Inc.
+## Copyright (C) 1995-1997, 2001-2007 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
        msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
        msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
        msgmerge-13 msgmerge-14 msgmerge-15 msgmerge-16 msgmerge-17 \
-       msgmerge-18 msgmerge-19 \
+       msgmerge-18 msgmerge-19 msgmerge-20 \
        msgmerge-compendium-1 msgmerge-compendium-2 msgmerge-compendium-3 \
        msgmerge-compendium-4 msgmerge-compendium-5 msgmerge-compendium-6 \
        msgmerge-properties-1 msgmerge-properties-2 \