From: Bruno Haible <bruno@clisp.org>
Date: Fri, 27 Jul 2001 14:59:19 +0000 (+0000)
Subject: Fix two msgcat bugs.
X-Git-Tag: v0.11~590
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=907ceae4f18d6ba2ca3647bd0655f36baa180f35;p=thirdparty%2Fgettext.git

Fix two msgcat bugs.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5267b3128..c92ff276b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-21  Bruno Haible  <haible@clisp.cons.org>
+
+	* msgcat.c (usage): The default value for more-than is 0 here.
+	(is_message_selected): Always keep the header entry. Needed when
+	option --unique is used.
+
 2001-07-21  Bruno Haible  <haible@clisp.cons.org>
 
 	* message.h (struct message_ty): Add fields 'alternative_count',
diff --git a/src/msgcat.c b/src/msgcat.c
index 52b9ac7ff..33259f00d 100644
--- a/src/msgcat.c
+++ b/src/msgcat.c
@@ -345,7 +345,7 @@ Message selection:\n\
                                  definitions, defaults to infinite if not\n\
                                  set\n\
   ->, --more-than=NUMBER         print messages with more than this many\n\
-                                 definitions, defaults to 1 if not set\n\
+                                 definitions, defaults to 0 if not set\n\
   -u, --unique                   shorthand for --less-than=2, requests\n\
                                  that only unique messages be printed\n\
 "));
@@ -448,8 +448,8 @@ is_message_selected (tmp)
 {
   int used = (tmp->used >= 0 ? tmp->used : - tmp->used);
 
-  /* FIXME: Add tmp->msgid[0] == '\0' || ... here? */
-  return (used > more_than && used < less_than);
+  return (tmp->msgid[0] == '\0') /* keep the header entry */
+	 || (used > more_than && used < less_than);
 }