* data/yacc.c: Fix last apostrophe warning from xgettext.

(cherry picked from commit 448dc38bc4a5396809f0987fd4e93488498122a4)

Conflicts:

	data/yacc.c
	src/parse-gram.c
	src/parse-gram.h

diff --git a/ChangeLog b/ChangeLog
index 1ed26ad9be4195b17bb54ed9b1d9f55968640e11..ba91749bdff3a0c3a5ea035c6f3b923de6532cfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-24  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       * data/yacc.c: Fix last apostrophe warning from xgettext.
+
 2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify handling of '.' and '-' after unbracketed named references.

diff --git a/data/yacc.c b/data/yacc.c
index e4a4fb05a5199c82d9c4392b27489c6574e27142..6bacbf842563ae6f85288031c5d7a92f3b790f2e 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -235,7 +235,7 @@ m4_define([b4_declare_parser_state_variables], [b4_pure_if([[
 m4_changecom()
 m4_divert_push(0)dnl
 @output(b4_parser_file_name@)@
-b4_copyright([Implementation for Bison's Yacc-like parsers in C])[
+b4_copyright([Bison implementation for Yacc-like parsers in C])[
 
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 643b20901eb65cc070bd57dbe0fdd9c3a78c9d58..bd3c167cbf2caa09b496637a9a7e91137d8aaf61 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,6 +1,6 @@
-/* A Bison parser, made by GNU Bison 2.4.555-5c9e.  */
+/* A Bison parser, made by GNU Bison 2.4.557-bf3e4.  */
 
-/* Implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
    Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
 
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.555-5c9e"
+#define YYBISON_VERSION "2.4.557-bf3e4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"

diff --git a/src/parse-gram.h b/src/parse-gram.h
index b44a8ec32a798b44b04376fd9de84ba311d8366b..18bd3bd6049151121f3d9d386b25f2fc238f06e9 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.555-5c9e.  */
+/* A Bison parser, made by GNU Bison 2.4.557-bf3e4.  */
 
 /* Bison interface for Yacc-like parsers in C