aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 028fe5d2db5..11703054d4f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12007-08-21 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc-hooks.el (vc-menu-entry): New var.
4 (vc-mode-line-map): Use it so that this menu also uses the extra-menu.
5 (menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
6 (vc-menu-map): Declare and initialize in one step.
7 (vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter
8
12007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> 92007-08-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 10
3 * smerge-mode.el (smerge-resolve): New arg `safe'. 11 * smerge-mode.el (smerge-resolve): New arg `safe'.