Commit 5438ecd3 authored by Karl Heuer's avatar Karl Heuer
Browse files

(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff

package.
parent ca2a3cb7
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
(define-key menu-bar-file-menu [epatch] (define-key menu-bar-file-menu [epatch]
'("Apply Patch" . menu-bar-epatch-menu)) '("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] (define-key menu-bar-file-menu [ediff]
'("Compare" . menu-bar-ediff-menu)) '("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] (define-key menu-bar-file-menu [separator-misc]
'("--")) '("--"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment