Moved (define-key menu-bar-ediff-menu ...) to ediff-hook.el:

menu-bar-ediff-menu is not defined yet.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 546def4..a43552a 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -123,9 +123,6 @@
 (define-key menu-bar-files-menu [dired] '("Open Directory..." . dired))
 (define-key menu-bar-files-menu [open-file] '("Open File..." . find-file))
 
-;; This is just one element of the ediff menu--the first.
-(define-key menu-bar-ediff-menu [window]
-  '("This Window And Next Window" . compare-windows))
 \f
 (defun nonincremental-search-forward (string)
   "Read a string and search for it nonincrementally."