diff options
| author | Stefan Monnier | 2007-08-21 15:07:36 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-21 15:07:36 +0000 |
| commit | e2247dc840eaa671f4b13df9772c1497038d1f9f (patch) | |
| tree | 9f46dd9d92fc18c94bbdf68acf12cc7c786a3fe8 /lisp/ChangeLog | |
| parent | 19c35c57186c38455004452626d597239f667a55 (diff) | |
| download | emacs-e2247dc840eaa671f4b13df9772c1497038d1f9f.tar.gz emacs-e2247dc840eaa671f4b13df9772c1497038d1f9f.zip | |
(vc-menu-entry): New var.
(vc-mode-line-map): Use it so that this menu also uses the extra-menu.
(menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
(vc-menu-map): Declare and initialize in one step.
(vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
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 @@ | |||
| 1 | 2007-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 | |||
| 1 | 2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2007-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'. |