diff options
| author | Kenichi Handa | 2010-11-01 16:55:44 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-11-01 16:55:44 +0900 |
| commit | 8877ed24fa258b82e1e813bb2b328bd35677e31a (patch) | |
| tree | d9002c2ef8efd5979674e7f5ea7c94301b6f8db5 /lisp/ChangeLog | |
| parent | f6f3366160e26ff5984f287e60616ec9f90acfa3 (diff) | |
| parent | 919dd7aa0a28d6baddd8802c132cba590d4baa85 (diff) | |
| download | emacs-8877ed24fa258b82e1e813bb2b328bd35677e31a.tar.gz emacs-8877ed24fa258b82e1e813bb2b328bd35677e31a.zip | |
merge trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9be6d045de3..94d7c9de921 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -14,6 +14,11 @@ | |||
| 14 | 14 | ||
| 15 | 2010-11-01 Glenn Morris <rgm@gnu.org> | 15 | 2010-11-01 Glenn Morris <rgm@gnu.org> |
| 16 | 16 | ||
| 17 | * calendar/holidays.el (general-holidays, oriental-holidays) | ||
| 18 | (local-holidays, other-holidays, hebrew-holidays, christian-holidays) | ||
| 19 | (islamic-holidays, bahai-holidays, solar-holidays): Move aliases before | ||
| 20 | the definitions of their targets. | ||
| 21 | |||
| 17 | * emacs-lisp/smie.el (smie): New custom group. | 22 | * emacs-lisp/smie.el (smie): New custom group. |
| 18 | (smie-blink-matching-inners, smie-indent-basic): Add :group. | 23 | (smie-blink-matching-inners, smie-indent-basic): Add :group. |
| 19 | 24 | ||