Merge remote-tracking branch 'origin/maint'

* origin/maint:
  skeletons: factor yacc.c and glr.c.
  glr.c: minor refactoring.
  tests: remove all the -On flags.
  maint: fix spello.
  maint: improve release procedure instructions.
  gnulib: update readme-release.
  maint: cfg.mk: manual title.
  maint: cfg.mk: simplify
  maint: post-release administrivia

Conflicts:
	NEWS
	bootstrap.conf

diff --cc NEWS
Simple merge

diff --cc README-hacking
Simple merge

diff --cc THANKS
Simple merge

diff --cc bootstrap.conf
index 6cdb017c0502f495ec0b66c38f3de4ea70321c8a,aa05e340d84b10a2dbbb3cea9a788666fe757298..cff387f98b94a16404b0ac565cecc64887e7713a
--- 1/bootstrap.conf
--- 2/bootstrap.conf
+++ b/bootstrap.conf
@@@ -17,14 -17,13 +17,13 @@@
  
  # gnulib modules used by this package.
  gnulib_modules='
-   announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
+   argmatch assert calloc-posix close closeout config-h c-strcase
    configmake
    dirname
-   do-release-commit-and-tag
-   error extensions fdl fopen-safer gendocs getopt-gnu
+   error extensions fdl fopen-safer getopt-gnu
    gettext git-version-gen gitlog-to-changelog
    gpl-3.0 hash inttypes isnan javacomp-script
-   javaexec-script ldexpl maintainer-makefile malloc-gnu
 -  javaexec-script ldexpl malloc-gnu mbschr mbsrchr
++  javaexec-script ldexpl malloc-gnu
    mbswidth obstack perror progname
    quote quotearg
    readme-release

diff --cc build-aux/.gitignore
Simple merge

diff --cc cfg.mk
Simple merge

diff --cc data/c.m4
Simple merge

diff --cc data/glr.c
index 8f77aa61d330b619770295cfd8bfe26a90b4661e,7ebc65c0e7e6ddcf595752138aef984668e2661d..1463a9a7f6def1f343befbcd466b2dfe4ce4b9fa
--- 1/data/glr.c
--- 2/data/glr.c
+++ b/data/glr.c
@@@ -159,9 -151,24 +159,24 @@@ m4_define([b4_lhs_location]
  # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
  # on RHS.
  m4_define([b4_rhs_location],
 -[(((yyGLRStackItem const *)yyvsp)@{YYFILL (($2) - ($1))@}.yystate.yyloc)])
 +[(b4_rhs_data([$1], [$2]).yyloc)])
  
  
+ ## -------------- ##
+ ## Declarations.  ##
+ ## -------------- ##
+ 
+ # b4_shared_declarations
+ # ----------------------
+ # Declaration that might either go into the header (if --defines)
+ # or open coded in the parser body.
+ m4_define([b4_shared_declarations],
+ [b4_percent_code_get([[requires]])[
+ ]b4_token_enums(b4_tokens)[
+ ]b4_declare_yylstype[
+ ]b4_percent_code_get([[provides]])[]dnl
+ ])
+ 
  
  ## -------------- ##
  ## Output files.  ##

diff --cc data/yacc.c
index 0cc17f3367f0f2402e8c8a45d9c1eab4adbb5b34,5ba271cb62a762ceb40e1316fe0950e9f9e7e48f..922a4ebec9d1b365fcd39b07dd8de461ebefb247
--- 1/data/yacc.c
--- 2/data/yacc.c
+++ b/data/yacc.c
@@@ -157,12 -155,12 +157,12 @@@ m4_define([b4_lhs_location]
  # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
  # on RHS.
  m4_define([b4_rhs_location],
 -[(yylsp@{($2) - ($1)@})])
 +          [(yylsp@{b4_subtract([$2], [$1])@})])
  
  
- ## ------------------ ##
- ## Parser variables.  ##
- ## ------------------ ##
+ ## -------------- ##
+ ## Declarations.  ##
+ ## -------------- ##
  
  # b4_declare_scanner_communication_variables
  # ------------------------------------------

diff --cc tests/atlocal.in
Simple merge