From: Bruno Haible <bruno@clisp.org>
Date: Wed, 24 Oct 2001 09:50:06 +0000 (+0000)
Subject: Fix comment handling.
X-Git-Tag: v0.11~419
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc1bc06b22b6b0276300003b78744dc221a2554;p=thirdparty%2Fgettext.git

Fix comment handling.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8fef1f99d..9b5514a0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-08  Bruno Haible  <haible@clisp.cons.org>
+
+	* xgettext.c (remember_a_message): When the comment tag is seen,
+	remember all remaining comment lines, not just one.
+
 2001-09-25  Bruno Haible  <haible@clisp.cons.org>
 
 	Upgrade to automake-1.5.
diff --git a/src/xgettext.c b/src/xgettext.c
index e2e11c1cb..5ce99e505 100644
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -880,7 +880,9 @@ meta information, not the empty string.\n")));
   if (!mp->comment_dot)
     {
       int j;
+      bool add_all_remaining_comments;
 
+      add_all_remaining_comments = add_all_comments;
       for (j = 0; ; ++j)
 	{
 	  const char *s = xgettext_comment (j);
@@ -921,9 +923,12 @@ meta information, not the empty string.\n")));
 	      if (interesting)
 		continue;
 	    }
-	  if (add_all_comments
-	      || (comment_tag != NULL
-		  && strncmp (s, comment_tag, strlen (comment_tag)) == 0))
+	  /* When the comment tag is seen, it drags in not only the line
+	     which it starts, but all remaining comment lines.  */
+	  if (add_all_remaining_comments
+	      || (add_all_remaining_comments =
+		    (comment_tag != NULL
+		     && strncmp (s, comment_tag, strlen (comment_tag)) == 0)))
 	    message_comment_dot_append (mp, s);
 	}
     }