* data/bison.m4 (b4_cat): Put a newline after the end delimiter of the

here document and before the EOF so that BSD's implementation of Bourne
shell doesn't parse the delimiter as part of the here document.
* doc/.cvsignore: Add cross-options.texi.
* src/getargs.c (usage): Add a blank line after the warning categories.

diff --git a/ChangeLog b/ChangeLog
index a522abcd2200e1b83e59a3bf4704480a6cafe5db..a24f3c53dfef5517a95cc2966861e202f9dce7c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-09  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * data/bison.m4 (b4_cat): Put a newline after the end delimiter of the
+       here document and before the EOF so that BSD's implementation of Bourne
+       shell doesn't parse the delimiter as part of the here document.
+       * doc/.cvsignore: Add cross-options.texi.
+       * src/getargs.c (usage): Add a blank line after the warning categories.
+

 2007-11-08  Paolo Bonzini  <bonzini@gnu.org>
 
        * data/lalr1.java (Lexer): Remove usage of b4_pure_if.
 2007-11-08  Paolo Bonzini  <bonzini@gnu.org>
 
        * data/lalr1.java (Lexer): Remove usage of b4_pure_if.

diff --git a/data/bison.m4 b/data/bison.m4
index 75c9b75359348e40f5ebdbc422ad14333af9dc18..6e1922b1ab9cf831dcfdbe10a7dee8df1fa20f50 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -74,7 +74,8 @@ version 2.2 of Bison.])])
 m4_define([b4_cat],
 [m4_syscmd([cat <<'_m4eof'
 ]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@
 m4_define([b4_cat],
 [m4_syscmd([cat <<'_m4eof'
 ]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@

-_m4eof])dnl
+_m4eof
+])dnl

 m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])])
 
 # b4_error(KIND, FORMAT, [ARG1], [ARG2], ...)
 m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])])
 
 # b4_error(KIND, FORMAT, [ARG1], [ARG2], ...)

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 15442d897103b0f322ad0deea9cf670f64f17121..f3d7a603aec7908e7cfbaf837f9871d9b19612a4 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -20,3 +20,4 @@ Makefile.in
 *.info*
 stamp-vti
 version.texi
 *.info*
 stamp-vti
 version.texi

+cross-options.texi

diff --git a/src/getargs.c b/src/getargs.c
index fca4401bac2c5d491db23e017cf46971691613f2..48103c6830e3f2a5efa46cddcc33ae0441fa8cad 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -298,6 +298,7 @@ Warning categories include:\n\
   `no-CATEGORY'     turn off warnings in CATEGORY\n\
   `none'            turn off all the warnings\n\
   `error'           treat warnings as errors\n\
   `no-CATEGORY'     turn off warnings in CATEGORY\n\
   `none'            turn off all the warnings\n\
   `error'           treat warnings as errors\n\

+\n\

 "), stdout);
 
       fputs (_("\
 "), stdout);
 
       fputs (_("\