* src/conflicts.c (conflicts_print): Correct format string typo:

use `%%' to produce literal `%'.  (trivial change)

diff --git a/ChangeLog b/ChangeLog
index e41f0b5bd1cd7fc9f9b24f23dce34f1873417830..4b472fccdfe6ad44c0a62968da6e5cd4547ff3c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-13  Jim Meyering  <jim@meyering.net>
+
+       * src/conflicts.c (conflicts_print): Correct format string typo:
+       use `%%' to produce literal `%'.  (trivial change)
+
 2004-03-30  Paul Eggert  <eggert@twinsun.com>
 
        * src/getargs.c (version): Update copyright year to 2004.
@@ -44,12 +49,12 @@
        * src/parse-gram.y: Define PERCENT_EXPECT_RR.
        (declaration): Replace expected_conflicts with expected_sr_conflicts.
        Add %expect-rr rule.
-       
+
        * src/scan-gram.l: Recognize %expect-rr.
 
-       * src/conflicts.h (expected_sr_conflicts): Rename from 
+       * src/conflicts.h (expected_sr_conflicts): Rename from
        expected_conflicts.
-       (expected_rr_conflicts): Declare.       
+       (expected_rr_conflicts): Declare.
 
        * src/conflicts.c (expected_sr_conflicts): Rename from
        expected_conflicts.
@@ -58,9 +63,9 @@
        for GLR parsers.
        Use expected_sr_conflicts in place of expected_conflicts.
        Warn if expected_rr_conflicts used in non-GLR parser.
-       
+
        * doc/bison.texinfo: Add documentation for %expect-rr.
-       
+
 2004-03-08  Paul Eggert  <eggert@gnu.org>
 
        Add support for hex token numbers.  Suggested by Odd Arild Olsen in

diff --git a/src/conflicts.c b/src/conflicts.c
index 7ad2ad12bc9f21577b52858d3a88f7823bcb629b..2edd1e8b3b981dfdec7936820cb88bbee52a1115 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,6 +1,6 @@
 /* Find and resolve or report look-ahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003
+   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -484,7 +484,7 @@ conflicts_print (void)
 
   if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1)
     {
-      warn (_("%expect-rr applies only to GLR parsers"));
+      warn (_("%%expect-rr applies only to GLR parsers"));
       expected_rr_conflicts = -1;
     }