From fe3cae17a1dd2afa1eb34239ba497252892b2090 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Mon, 24 Jan 2011 21:10:41 -0500 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ data/yacc.c | 2 +- src/parse-gram.c | 6 +++--- src/parse-gram.h | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ed26ad9..ba91749b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-24 Joel E. Denny + + * data/yacc.c: Fix last apostrophe warning from xgettext. + 2011-01-09 Paul Eggert Simplify handling of '.' and '-' after unbracketed named references. diff --git a/data/yacc.c b/data/yacc.c index e4a4fb05..6bacbf84 100644 --- 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 643b2090..bd3c167c 100644 --- 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 b44a8ec3..18bd3bd6 100644 --- 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 -- 2.45.2