Mercurial > emacs
comparison lisp/ChangeLog @ 82500:029c5ed25e99
(vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 21 Aug 2007 15:08:47 +0000 |
| parents | 3ecf9562ce0b |
| children | 2a2056106d16 |
comparison
equal
deleted
inserted
replaced
| 82499:3ecf9562ce0b | 82500:029c5ed25e99 |
|---|---|
| 3 * vc-hooks.el (vc-menu-entry): New var. | 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. | 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. | 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. | 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 | |
| 9 * menu-bar.el (vc-menu-map): Don't setup any more. | |
| 10 Instead, just create the proper spot in the menu. | |
| 8 | 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'. |
| 12 (smerge-resolve-all, smerge-batch-resolve): New function. | 15 (smerge-resolve-all, smerge-batch-resolve): New function. |