Update CEDET from upstream.

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index b5b1b75..2da6552 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,18 @@
+2012-10-01  David Engster  <deng@randomsample.de>
+
+       * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
+       Remove.
+        (bovine-grammar-expand-form): Test for emacs-major-version.
+
+       * grammars/c.by: Add EXPLICIT to keyword tokens.
+
+        * grammars/f90.by: Add %provide token.
+
+        * grammar/grammar.wy (semantic-grammar-lexer): Remove, since it
+       was copied to grammar.el.  New %provide token to generate prefix
+       which conforms with Emacs conventions.  Remove lexer definition,
+       which is now in grammar.el.
+
 2012-09-27  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (set-version): Set msdos.c's Vwindow_system_version.