From: Bruno Haible <bruno@clisp.org>
Date: Mon, 4 Mar 2002 12:16:04 +0000 (+0000)
Subject: "&&" means no accelerator.
X-Git-Tag: v0.11.1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=546dad3b7e749abf023dc6d07cc45da9b02ec23f;p=thirdparty%2Fgettext.git

"&&" means no accelerator.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a787e89bd..9b8d00028 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-02  Bruno Haible  <bruno@clisp.org>
+
+	* msgfmt.c (check_pair): Don't count "&&" as an accelerator designator,
+	for consistency with Qt and KDE.
+
 2002-02-24  Bruno Haible  <bruno@clisp.org>
 
 	* po-lex.c: Include libstdarg.h.
diff --git a/src/msgfmt.c b/src/msgfmt.c
index be5c2dc06..5b2ca40ec 100644
--- a/src/msgfmt.c
+++ b/src/msgfmt.c
@@ -1181,11 +1181,14 @@ check_pair (msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos,
       p = strchr (msgid, accelerator_char);
       if (p != NULL && strchr (p + 1, accelerator_char) == NULL)
 	{
-	  /* Count the number of '&' in msgstr.  */
+	  /* Count the number of '&' in msgstr, but ignore '&&'.  */
 	  unsigned int count = 0;
 
 	  for (p = msgstr; (p = strchr (p, accelerator_char)) != NULL; p++)
-	    count++;
+	    if (p[1] == accelerator_char)
+	      p++;
+	    else
+	      count++;
 
 	  if (count == 0)
 	    {