Mercurial > emacs
changeset 11044:796be3f4f8a1
(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
package.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 16 Mar 1995 23:04:55 +0000 |
| parents | 4c0a98538670 |
| children | b4bf1f2d99f8 |
| files | lisp/menu-bar.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/menu-bar.el Thu Mar 16 22:36:26 1995 +0000 +++ b/lisp/menu-bar.el Thu Mar 16 23:04:55 1995 +0000 @@ -46,9 +46,10 @@ (define-key menu-bar-file-menu [epatch] '("Apply Patch" . menu-bar-epatch-menu)) +(define-key menu-bar-file-menu [ediff-merge] + '("Merge" . menu-bar-ediff-merge-menu)) (define-key menu-bar-file-menu [ediff] '("Compare" . menu-bar-ediff-menu)) -(define-key menu-bar-file-menu [emerge] '("Emerge" . menu-bar-emerge-menu)) (define-key menu-bar-file-menu [separator-misc] '("--"))