Mercurial > emacs

changeset 12291:5724b13e7b7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bogus references to menu-bar-file-menu in define-key forms.
author Roland McGrath <roland@gnu.org>
date Sat, 17 Jun 1995 06:33:08 +0000
parents 99ffac67fb53
children f39e50542302
files lisp/ediff.el
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff.el	Sat Jun 17 01:49:35 1995 +0000
+++ b/lisp/ediff.el	Sat Jun 17 06:33:08 1995 +0000
@@ -1768,7 +1768,7 @@
 	()
       (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 @@
     ;; 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 @@
 	'("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]