diff options
author | Roland McGrath <roland@gnu.org> | 1995-06-17 06:33:08 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-06-17 06:33:08 +0000 |
commit | 305174b653ac5ab5e8fae755a2daab2af49a7dbe (patch) | |
tree | 695979a124b6c32d2885d8b1401256e1a643bccb /lisp/ediff.el | |
parent | d62545ffe5c831f69c87c528f7a8fc5aadf3edf1 (diff) | |
download | emacs-305174b653ac5ab5e8fae755a2daab2af49a7dbe.tar.gz |
Fixed bogus references to menu-bar-file-menu in define-key forms.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r-- | lisp/ediff.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 73cc1b9a07f..08fdfc6e3b4 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -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] |