Mercurial > emacs
comparison lisp/ChangeLog @ 82499:3ecf9562ce0b
(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
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 21 Aug 2007 15:07:36 +0000 |
| parents | 962fb740e73f |
| children | 029c5ed25e99 |
comparison
equal
deleted
inserted
replaced
| 82498:e80c1b8b7d58 | 82499:3ecf9562ce0b |
|---|---|
| 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'. |
| 4 (smerge-resolve-all, smerge-batch-resolve): New function. | 12 (smerge-resolve-all, smerge-batch-resolve): New function. |
| 5 (smerge-refine): Make sure `diff' returns the expected result. | 13 (smerge-refine): Make sure `diff' returns the expected result. |