Merge remote-tracking branch 'origin/maint'

* origin/maint:
  regen
  yacc: fix handling of CPP guards when no header is generated
  gnulib: update

diff --git a/NEWS b/NEWS
index bc66a4cb0c73dda56bb41e3523d3e8f2b3b8c828..7f0fe8b296f1dfbd3ae2f45192ab4c0ce8571600 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -199,6 +199,17 @@ GNU Bison NEWS
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes
+
+  Bugs in the test suite have been fixed.
+
+  Some errors in translations have been addressed, and --help now directs
+  users to the appropriate place to report them.
+
+  Stray Info files shipped by accident are removed.
+
+  Incorrect definitions of YY_, issued by yacc.c when no parser header is
+  generated, are removed.
 
 * Noteworthy changes in release 2.6.2 (2012-08-03) [stable]
 

diff --git a/data/c.m4 b/data/c.m4
index 1a527b5818b656bc9b45102c886fb8abb8d18f67..84713884a589ea9ee6fa8bb15e100ff8ff36f8ca 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -36,13 +36,15 @@ m4_define([b4_cpp_guard],
 # b4_cpp_guard_open(FILE)
 # b4_cpp_guard_close(FILE)
 # ------------------------
-# Open/close CPP inclusion guards for FILE.
+# If FILE does not expand to nothing, open/close CPP inclusion guards for FILE.
 m4_define([b4_cpp_guard_open],
+[m4_ifval(m4_quote($1),
 [#ifndef b4_cpp_guard([$1])
-# define b4_cpp_guard([$1])])
+# define b4_cpp_guard([$1])])])
 
 m4_define([b4_cpp_guard_close],
-[#endif b4_comment([!b4_cpp_guard([$1])])])
+[m4_ifval(m4_quote($1),
+[#endif b4_comment([!b4_cpp_guard([$1])])])])
 
 
 ## ---------------- ##

diff --git a/data/yacc.c b/data/yacc.c
index a15ef770d93f6b2493ab66731d238d60b31f93ce..44f96dda374ee4f0cf1a877efa88cbba8b28d83d 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -340,9 +340,11 @@ m4_if(b4_api_prefix, [yy], [],
 # define YYERROR_VERBOSE ]b4_error_verbose_if([1], [0])[
 #endif
 
-/* In a future release of Bison, this section will be replaced
+]m4_ifval(m4_quote(b4_spec_defines_file),
+[[/* In a future release of Bison, this section will be replaced
    by #include "@basename(]b4_spec_defines_file[@)".  */
-]b4_shared_declarations[
+]])dnl
+b4_shared_declarations[
 
 /* Copy the second part of user declarations.  */
 ]b4_user_post_prologue

diff --git a/gnulib b/gnulib
index bd54a45e6e4bcb3ee7359c9b4f1d831a6291148f..cb38ce7db84edb421fbaeea5abe16ebeb8ad8a5c 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit bd54a45e6e4bcb3ee7359c9b4f1d831a6291148f
+Subproject commit cb38ce7db84edb421fbaeea5abe16ebeb8ad8a5c

diff --git a/lib/.gitignore b/lib/.gitignore
index a448e841ed2b304f9343fd3799e7db08d1f95e11..e62b99c31b56485a4780d3754d55da6eab5fe10a 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -271,3 +271,5 @@
 /xsize.h
 /xstrndup.c
 /xstrndup.h
+/binary-io.c
+/xsize.c

diff --git a/m4/.gitignore b/m4/.gitignore
index c6a84ce83eaf0615dd72c061816e858300f897fc..d31785861c01a46fe364231a528579ca7875ba04 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -182,3 +182,4 @@
 /xsize.m4
 /xstrndup.m4
 /obstack-printf.m4
+/extern-inline.m4