Merge branch 'maint'

* maint:
  maint: post-release administrivia
  version 3.3.1
  yacc: issue warnings, not errors, for Bison extensions
  style: formatting changes in NEWS and complain.c
  tests: don't depend on the user's definition of SHELL

2 files changed, 5 insertions, 3 deletions

diff --git a/src/complain.c b/src/complain.c
index a4ab0a1f..50f65af5 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -421,8 +421,10 @@ duplicate_rule_directive (char const *directive,
                           location first, location second)
 {
   unsigned i = 0;
-  complain_indent (&second, complaint, &i, _("only one %s allowed per rule"), directive);
+  complain_indent (&second, complaint, &i,
+                   _("only one %s allowed per rule"), directive);
   i += SUB_INDENT;
-  complain_indent (&first, complaint, &i, _("previous declaration"));
+  complain_indent (&first, complaint, &i,
+                   _("previous declaration"));
   fixits_register (&second, "");
 }
diff --git a/src/getargs.c b/src/getargs.c
index 4c411583..973d0f69 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -708,7 +708,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'y':
-        warning_argmatch ("error=yacc", 0, 6);
+        warning_argmatch ("yacc", 0, 0);
         yacc_loc = command_line_location ();
         break;