diff options
| author | Glenn Morris | 2011-01-17 18:49:59 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-17 18:49:59 -0800 |
| commit | a9faac5c6333bcbfb30a00debf3de7a44e430e49 (patch) | |
| tree | 32ac93da5a3873c87131704a6469838b044d575d /lisp/ChangeLog | |
| parent | acce4a473ad27f2dec42cf2d35ffe3bb1acd471a (diff) | |
| parent | 9d760d754bde2eadd3f017fec5ea1cbe3810d666 (diff) | |
| download | emacs-a9faac5c6333bcbfb30a00debf3de7a44e430e49.tar.gz emacs-a9faac5c6333bcbfb30a00debf3de7a44e430e49.zip | |
Merge from emacs-23 branch, up to 2010-05-20T22:16:19Z!juri@jurta.org.
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 969b0c6997a..2d381534228 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2011-01-18 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2011-01-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the | ||
| 4 | keymap expression. Improve docstring. | ||
| 5 | |||
| 6 | 2011-01-18 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 7 | |||
| 3 | * electric.el (electric-indent-post-self-insert-function): | 8 | * electric.el (electric-indent-post-self-insert-function): |
| 4 | Don't auto-indent for indent-to-left-margin, it's too often | 9 | Don't auto-indent for indent-to-left-margin, it's too often |
| 5 | counter-productive. | 10 | counter-productive. |