Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bogus references to menu-bar-file-menu in define-key forms.

Browse source
This commit is contained in:
Roland McGrath 1995-06-17 06:33:08 +00:00
parent 719191cf4a
commit 2ef2d89752
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ediff.el
View file

@ -1768,7 +1768,7 @@ With prefix argument, prompts for a revision name."
()
(define-key menu-bar-ediff-menu [ediff-revision]
'("File with Revision ..." . ediff-revision))
(define-key menu-bar-file-menu [separator-ediff-files] '("--"))
(define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
(define-key menu-bar-ediff-menu [ediff-buffers3]
'("Three Buffers ..." . ediff-buffers3))
(define-key menu-bar-ediff-menu [ediff-files3]
@ -1784,12 +1784,12 @@ With prefix argument, prompts for a revision name."
;; explicit string-match, as ediff-xemacs-p is not defined at build time
(if (string-match "\\(Lucid\\|Xemacs\\)" emacs-version)
()
(define-key menu-bar-file-menu [separator-ediff-regions] '("--"))
(define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
(define-key menu-bar-ediff-menu [ediff-regions-linewise]
'("Regions Line-by-line ..." . ediff-regions-linewise))
(define-key menu-bar-ediff-menu [ediff-regions-wordwise]
'("Regions Word-by-word ..." . ediff-regions-wordwise))
(define-key menu-bar-file-menu [separator-ediff-windows] '("--"))
(define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
(define-key menu-bar-ediff-menu [ediff-windows-linewise]
'("Windows Line-by-line ..." . ediff-windows-linewise))
(define-key menu-bar-ediff-menu [ediff-windows-wordwise]
@ -1806,7 +1806,7 @@ With prefix argument, prompts for a revision name."
'("Revisions with Ancestor ..." . ediff-merge-revisions-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
'("Revisions ..." . ediff-merge-revisions))
(define-key menu-bar-file-menu [separator-ediff-merge] '("--"))
(define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
'("Buffers with Ancestor ..." . ediff-merge-buffers-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]