Merge remote-tracking branch 'origin/maint'

[bison.git] / NEWS

diff --git a/NEWS b/NEWS
index c0414a2148bc5c0e01519495fd9756d2c0726d4f..eddfa8ee4f0982c28b728ce5d680baea1cbc0fc5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ GNU Bison NEWS
 
 ** Warnings
 
-*** Warning categories are now diplayed in warnings
+*** Warning categories are now displayed in warnings
 
   For instance:
 
@@ -117,7 +117,7 @@ GNU Bison NEWS
   YYERROR) if the expression evaluates to 0, and are evaluated immediately
   in GLR parsers, rather than being deferred.  The result is that they
   allow the programmer to prune possible parses based on the values of
-  runtime expressions.
+  run-time expressions.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
@@ -213,10 +213,19 @@ GNU Bison NEWS
     # define BAR_FOO_H                  # define BAR_FOO_H
 
     /* Enabling traces.  */             /* Enabling traces.  */
-    # ifndef YYDEBUG                    # ifndef YYDEBUG
-    #  define YYDEBUG 0                 #  define YYDEBUG 0
-    # endif                             # endif
-    # if YYDEBUG                        # if YYDEBUG
+    # ifndef YYDEBUG                  | # ifndef BAR_DEBUG
+                                      > #  if defined YYDEBUG
+                                      > #   if YYDEBUG
+                                      > #    define BAR_DEBUG 1
+                                      > #   else
+                                      > #    define BAR_DEBUG 0
+                                      > #   endif
+                                      > #  else
+    #  define YYDEBUG 0               | #   define BAR_DEBUG 0
+                                      > #  endif
+    # endif                           | # endif
+
+    # if YYDEBUG                      | # if BAR_DEBUG
     extern int bar_debug;               extern int bar_debug;
     # endif                             # endif
 
@@ -1913,7 +1922,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  LocalWords:  namespaces strerror const autoconfiguration Dconst Autoconf's FDL
  LocalWords:  Automake TMPDIR LESSEQ ylwrap endif yydebug YYTOKEN YYLSP ival hh
  LocalWords:  extern YYTOKENTYPE TOKENTYPE yytokentype tokentype STYPE lval pdf
- LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp
+ LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp Wother nterm arg init
+ LocalWords:  TOK
 
 Local Variables:
 mode: outline