diff options
| author | Simon Leinen | 2012-03-24 21:23:23 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-03-24 21:23:23 +0800 |
| commit | 6e7e90fa24df8bddeab77f9846d74e06f75ed9bc (patch) | |
| tree | 82af6dd112d0b466aef50aefeeece848df1a568b /lisp/ChangeLog | |
| parent | f06e2758ba96694f76389a65f7395dbae557ba73 (diff) | |
| download | emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.tar.gz emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.zip | |
* vc/vc.el (vc-merge): Fix a prompt.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 36dd6fc8a3f..04aa0afb690 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,8 +1,14 @@ | |||
| 1 | 2012-03-24 Simon Leinen <simon.leinen@gmail.com> | ||
| 2 | |||
| 3 | * vc/vc.el (vc-merge): Fix a prompt. | ||
| 4 | |||
| 1 | 2012-03-24 Chong Yidong <cyd@gnu.org> | 5 | 2012-03-24 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * mwheel.el (mwheel-scroll): Call deactivate-mark at the right | 7 | * mwheel.el (mwheel-scroll): Call deactivate-mark at the right |
| 4 | point (Bug#9623). | 8 | point (Bug#9623). |
| 5 | 9 | ||
| 10 | * button.el (button-at): Minor addition to docstring. | ||
| 11 | |||
| 6 | 2012-03-23 Stefan Monnier <monnier@iro.umontreal.ca> | 12 | 2012-03-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 13 | ||
| 8 | * newcomment.el (comment-choose-indent): No space after BOL. | 14 | * newcomment.el (comment-choose-indent): No space after BOL. |