diff options
| author | Kenichi Handa | 2012-10-06 21:55:09 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-06 21:55:09 +0900 |
| commit | 16ddec7e9e6adcf615db097d9627d490ca29208c (patch) | |
| tree | 1c16b9565c9cca81ec8f5b10f0f4110340d4654a /admin/ChangeLog | |
| parent | 2b89bca49d55cec1a004353354a76de2972c68f3 (diff) | |
| parent | d5acb99a199d83cde1a43482709c3e9d4ec34b2f (diff) | |
| download | emacs-16ddec7e9e6adcf615db097d9627d490ca29208c.tar.gz emacs-16ddec7e9e6adcf615db097d9627d490ca29208c.zip | |
merge trunk
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index b5b1b75c55c..2da65523116 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,18 @@ | |||
| 1 | 2012-10-01 David Engster <deng@randomsample.de> | ||
| 2 | |||
| 3 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): | ||
| 4 | Remove. | ||
| 5 | (bovine-grammar-expand-form): Test for emacs-major-version. | ||
| 6 | |||
| 7 | * grammars/c.by: Add EXPLICIT to keyword tokens. | ||
| 8 | |||
| 9 | * grammars/f90.by: Add %provide token. | ||
| 10 | |||
| 11 | * grammar/grammar.wy (semantic-grammar-lexer): Remove, since it | ||
| 12 | was copied to grammar.el. New %provide token to generate prefix | ||
| 13 | which conforms with Emacs conventions. Remove lexer definition, | ||
| 14 | which is now in grammar.el. | ||
| 15 | |||
| 1 | 2012-09-27 Glenn Morris <rgm@gnu.org> | 16 | 2012-09-27 Glenn Morris <rgm@gnu.org> |
| 2 | 17 | ||
| 3 | * admin.el (set-version): Set msdos.c's Vwindow_system_version. | 18 | * admin.el (set-version): Set msdos.c's Vwindow_system_version. |