"&&" means no accelerator.

diff --git a/src/ChangeLog b/src/ChangeLog
index a787e89bd8e50719e24a2459bdc8ad055a188950..9b8d00028f0695471c34d6645d9afe4e986d96d1 100644 (file)
--- 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 be5c2dc06685ab4262beaa9810e6489c3c555508..5b2ca40ec83bfb8fe6e3e8215513ab3635ccdfb2 100644 (file)
--- 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)
            {