aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath1995-06-17 06:33:08 +0000
committerRoland McGrath1995-06-17 06:33:08 +0000
commit2ef2d89752a6aa9e5be8079ed5e40a2d46d5c9d9 (patch)
treee87b17e264300f181c05039eea569c72a51a7817
parent719191cf4a69e09103766f77783edc731439aaa2 (diff)
downloademacs-2ef2d89752a6aa9e5be8079ed5e40a2d46d5c9d9.tar.gz
emacs-2ef2d89752a6aa9e5be8079ed5e40a2d46d5c9d9.zip
Fixed bogus references to menu-bar-file-menu in define-key forms.
-rw-r--r--lisp/ediff.el8
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."
1768 () 1768 ()
1769 (define-key menu-bar-ediff-menu [ediff-revision] 1769 (define-key menu-bar-ediff-menu [ediff-revision]
1770 '("File with Revision ..." . ediff-revision)) 1770 '("File with Revision ..." . ediff-revision))
1771 (define-key menu-bar-file-menu [separator-ediff-files] '("--")) 1771 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
1772 (define-key menu-bar-ediff-menu [ediff-buffers3] 1772 (define-key menu-bar-ediff-menu [ediff-buffers3]
1773 '("Three Buffers ..." . ediff-buffers3)) 1773 '("Three Buffers ..." . ediff-buffers3))
1774 (define-key menu-bar-ediff-menu [ediff-files3] 1774 (define-key menu-bar-ediff-menu [ediff-files3]
@@ -1784,12 +1784,12 @@ With prefix argument, prompts for a revision name."
1784 ;; explicit string-match, as ediff-xemacs-p is not defined at build time 1784 ;; explicit string-match, as ediff-xemacs-p is not defined at build time
1785 (if (string-match "\\(Lucid\\|Xemacs\\)" emacs-version) 1785 (if (string-match "\\(Lucid\\|Xemacs\\)" emacs-version)
1786 () 1786 ()
1787 (define-key menu-bar-file-menu [separator-ediff-regions] '("--")) 1787 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
1788 (define-key menu-bar-ediff-menu [ediff-regions-linewise] 1788 (define-key menu-bar-ediff-menu [ediff-regions-linewise]
1789 '("Regions Line-by-line ..." . ediff-regions-linewise)) 1789 '("Regions Line-by-line ..." . ediff-regions-linewise))
1790 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] 1790 (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
1791 '("Regions Word-by-word ..." . ediff-regions-wordwise)) 1791 '("Regions Word-by-word ..." . ediff-regions-wordwise))
1792 (define-key menu-bar-file-menu [separator-ediff-windows] '("--")) 1792 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
1793 (define-key menu-bar-ediff-menu [ediff-windows-linewise] 1793 (define-key menu-bar-ediff-menu [ediff-windows-linewise]
1794 '("Windows Line-by-line ..." . ediff-windows-linewise)) 1794 '("Windows Line-by-line ..." . ediff-windows-linewise))
1795 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] 1795 (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
@@ -1806,7 +1806,7 @@ With prefix argument, prompts for a revision name."
1806 '("Revisions with Ancestor ..." . ediff-merge-revisions-with-ancestor)) 1806 '("Revisions with Ancestor ..." . ediff-merge-revisions-with-ancestor))
1807 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] 1807 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
1808 '("Revisions ..." . ediff-merge-revisions)) 1808 '("Revisions ..." . ediff-merge-revisions))
1809 (define-key menu-bar-file-menu [separator-ediff-merge] '("--")) 1809 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
1810 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] 1810 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
1811 '("Buffers with Ancestor ..." . ediff-merge-buffers-with-ancestor)) 1811 '("Buffers with Ancestor ..." . ediff-merge-buffers-with-ancestor))
1812 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] 1812 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]