diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-01-09 22:43:02 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-01-09 22:43:02 -0500 |
| commit | 3f9549e874035d963eb5ca02f24d51dc935e6326 (patch) | |
| tree | 1340657aa0689287b52f3dba9d8c6bc4da822c02 /admin | |
| parent | b14abca9476cba2f500b5eda89441d593dd0f12b (diff) | |
| parent | c4dd9efc9ed3f7de8f4ee74b6d47f65ad72320cf (diff) | |
| download | emacs-3f9549e874035d963eb5ca02f24d51dc935e6326.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index fa001ede6cb..7d77becb522 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -132,15 +132,14 @@ * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): Remove. - (bovine-grammar-expand-form): Test for emacs-major-version. + (bovine-grammar-expand-form): Test for emacs-major-version. * grammars/c.by: Add EXPLICIT to keyword tokens. + Add %provide token. - * grammars/f90.by: Add %provide token. - - * grammar/grammar.wy (semantic-grammar-lexer): Remove, since it + * grammars/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 conforms with Emacs conventions. Remove lexer definition, which is now in grammar.el. 2012-09-27 Glenn Morris <rgm@gnu.org> @@ -184,7 +183,7 @@ 2012-09-13 Paul Eggert <eggert@cs.ucla.edu> Simplify SIGIO usage (Bug#12408). - * CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL) + * CPP-DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL) (BROKEN_SIGPTY, NO_TERMIO): Remove. 2012-09-11 Paul Eggert <eggert@cs.ucla.edu> |