From: Bruno Haible <bruno@clisp.org>
Date: Tue, 8 Aug 2006 11:31:48 +0000 (+0000)
Subject: Fix a dumb file:line display during warnings inside write-po.c.
X-Git-Tag: 0.16.x-branchpoint~210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ba4d45e43e552e3fe869fe052ce868b9b099efd;p=thirdparty%2Fgettext.git

Fix a dumb file:line display during warnings inside write-po.c.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ac435a5b0..2486d2004 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Bruno Haible  <bruno@clisp.org>
+
+	* xgettext.c (remember_a_message): Use the position passed as argument
+	instead of a dummypos.
+	Reported by Paul Eggert <eggert@cs.ucla.edu>.
+
 2006-08-01  Bruno Haible  <bruno@clisp.org>
 
 	Fix behaviour of msgmerge when the PO file and the compendium are
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 7c0e29832..aaabe8c49 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -2035,8 +2035,6 @@ meta information, not the empty string.\n")));
     }
   else
     {
-      static lex_pos_ty dummypos = { __FILE__, __LINE__ };
-
       /* Construct the msgstr from the prefix and suffix, otherwise use the
 	 empty string.  */
       if (msgstr_prefix)
@@ -2046,7 +2044,7 @@ meta information, not the empty string.\n")));
 
       /* Allocate a new message and append the message to the list.  */
       mp = message_alloc (msgctxt, msgid, NULL, msgstr, strlen (msgstr) + 1,
-			  &dummypos);
+			  pos);
       /* Do not free msgctxt and msgid.  */
       message_list_append (mlp, mp);
     }