(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
package.
This commit is contained in:
parent
ca2a3cb73f
commit
5438ecd32e
1 changed files with 2 additions and 1 deletions
|
@ -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]
|
||||
'("--"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue