Fix bug that confused qt-format with c-format.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 588f18629d60b41c27f14e29f384106b1e359af0..4ea7fce6a39bfe02b69a19930942896ae77d120c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-12  Bruno Haible  <bruno@clisp.org>
+
+       * xgettext.c (xgettext_record_flag): When asked to set "qt-format",
+       really set "qt-format", not "c-format". Fixes bug introduced on
+       2003-10-19.
+
 2006-02-12  Bruno Haible  <bruno@clisp.org>
 
        Reduce the number of false positives produced by the c-format guessing

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 9da84765577bb9321c4dbd58b9871dfdcbfc3bd5..c3c28d8d2318be0fbece30ab20647bc27e738e0f 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -1528,7 +1528,7 @@ xgettext_record_flag (const char *optionstring)
                                                    argnum, value, pass);
                    break;
                  case format_qt:
-                   flag_context_list_table_insert (&flag_table_c, 0,
+                   flag_context_list_table_insert (&flag_table_c, 1,
                                                    name_start, name_end,
                                                    argnum, value, pass);
                    break;

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 3fbed63303d8a8478b03b20297874542686a179b..f35649cfe110d2407a56ee7282a4ac5319cc487a 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-12  Bruno Haible  <bruno@clisp.org>
+
+       * xgettext-c-13: New file.
+       * Makefile.am (TESTS): Add it.
+
 2006-02-12  Bruno Haible  <bruno@clisp.org>
 
        * xgettext-c-12: New file.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 6031e07a2722daa270f4c876708c9ff0ac2d58ec..b30be36a4d78bfd85888f4117ad947625dd8e1f2 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -64,7 +64,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
        xgettext-awk-1 \
        xgettext-c-1 xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \
        xgettext-c-6 xgettext-c-7 xgettext-c-8 xgettext-c-9 xgettext-c-10 \
-       xgettext-c-11 xgettext-c-12 \
+       xgettext-c-11 xgettext-c-12 xgettext-c-13 \
        xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
        xgettext-csharp-4 xgettext-csharp-5 \
        xgettext-elisp-1 \