Merge remote-tracking branch 'origin/maint'

* origin/maint:
  getargs: don't label --language/-l as experimental
  getargs: fix the locations of command-line input
  errors: indent missing action code semicolon warning

Conflicts:
	NEWS
	src/scan-code.l
	tests/actions.at
This commit is contained in:
Akim Demaille
2012-12-05 11:03:08 +01:00
6 changed files with 38 additions and 38 deletions

View File

@@ -5237,8 +5237,6 @@ Specify the programming language for the generated parser. Currently
supported languages include C, C++, and Java.
@var{language} is case-insensitive.
This directive is experimental and its effect may be modified in future
releases.
@end deffn
@deffn {Directive} %locations
@@ -9656,9 +9654,6 @@ Specify the programming language for the generated parser, as if
Summary}). Currently supported languages include C, C++, and Java.
@var{language} is case-insensitive.
This option is experimental and its effect may be modified in future
releases.
@item --locations
Pretend that @code{%locations} was specified. @xref{Decl Summary}.