aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog6
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 @@
12012-03-24 Simon Leinen <simon.leinen@gmail.com>
2
3 * vc/vc.el (vc-merge): Fix a prompt.
4
12012-03-24 Chong Yidong <cyd@gnu.org> 52012-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
62012-03-23 Stefan Monnier <monnier@iro.umontreal.ca> 122012-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.