diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-03-16 23:04:55 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-03-16 23:04:55 +0000 |
| commit | 5438ecd32e4af020875e7068351f5225b72142d9 (patch) | |
| tree | 801fac26c7dcb1ae9312bb69b64439700880e969 /lisp | |
| parent | ca2a3cb73fbd4f372825c0ed256cdb01577eca80 (diff) | |
| download | emacs-5438ecd32e4af020875e7068351f5225b72142d9.tar.gz emacs-5438ecd32e4af020875e7068351f5225b72142d9.tar.bz2 emacs-5438ecd32e4af020875e7068351f5225b72142d9.zip | |
(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
package.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/menu-bar.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 872a38bdc39..0e350d93b17 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -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] '("--")) |