diff options
| author | Stefan Monnier | 2007-08-21 15:08:47 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-21 15:08:47 +0000 |
| commit | dc172b732392aea2e29dc5eec19d2d4740deccac (patch) | |
| tree | d0d0e852101e711539a14aa65ee0ecbd19f9f01e /lisp/ChangeLog | |
| parent | e2247dc840eaa671f4b13df9772c1497038d1f9f (diff) | |
| download | emacs-dc172b732392aea2e29dc5eec19d2d4740deccac.tar.gz emacs-dc172b732392aea2e29dc5eec19d2d4740deccac.zip | |
(vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11703054d4f..31e50780b0d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | (vc-menu-map): Declare and initialize in one step. | 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 | 7 | (vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter |
| 8 | 8 | ||
| 9 | * menu-bar.el (vc-menu-map): Don't setup any more. | ||
| 10 | Instead, just create the proper spot in the menu. | ||
| 11 | |||
| 9 | 2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> | 12 | 2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 10 | 13 | ||
| 11 | * smerge-mode.el (smerge-resolve): New arg `safe'. | 14 | * smerge-mode.el (smerge-resolve): New arg `safe'. |