Make menu bar defines unconditional.

Don't alter menu-bar-files-menu here; menu-bar.el does that.

1 files changed, 19 insertions, 27 deletions

diff --git a/lisp/ediff.el b/lisp/ediff.el
index f7d726d14ee..013dc7bce9e 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1456,37 +1456,29 @@ Do not start with `~/' or `~user-name/'.")
 ;;; Note that autoload.el currently looks for cookies
 ;;; only at top level in the file.
 ;;;###autoload
-(if (not (ediff-if-lucid))
-    (progn
-      (defvar menu-bar-epatch-menu (make-sparse-keymap "menu-bar-epatch-map"))
-      (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
-      (defvar menu-bar-ediff-menu (make-sparse-keymap "menu-bar-ediff-map"))
-      (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))))
+(progn
+  (defvar menu-bar-epatch-menu (make-sparse-keymap "menu-bar-epatch-map"))
+  (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
+  (defvar menu-bar-ediff-menu (make-sparse-keymap "menu-bar-ediff-map"))
+  (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)))
 
 ;;;###autoload
-(if (not (ediff-if-lucid))
-    (progn
-      (define-key menu-bar-ediff-menu [rcs-ediff]
-        '("With a Revision via RCS ..." . rcs-ediff))
-      (define-key menu-bar-ediff-menu [vc-ediff]
-        '("With a Revision via VC ..." . vc-ediff))
-      (define-key menu-bar-ediff-menu [ediff-buffers]
-        '("Between Buffers ..." . ediff-buffers))
-      (define-key menu-bar-ediff-menu [ediff-files]
-        '("Between Files ..." . ediff-files))))
+(progn
+  (define-key menu-bar-ediff-menu [rcs-ediff]
+    '("With a Revision via RCS ..." . rcs-ediff))
+  (define-key menu-bar-ediff-menu [vc-ediff]
+    '("With a Revision via VC ..." . vc-ediff))
+  (define-key menu-bar-ediff-menu [ediff-buffers]
+    '("Between Buffers ..." . ediff-buffers))
+  (define-key menu-bar-ediff-menu [ediff-files]
+    '("Between Files ..." . ediff-files)))
 
 ;;;###autoload
-(if (not (ediff-if-lucid))
-    (progn
-      (define-key menu-bar-epatch-menu [ediff-patch-buffer]
-        '("To a Buffer ..." . ediff-patch-buffer))
-      (define-key menu-bar-epatch-menu [ediff-patch-file]
-        '("To a File ..." . ediff-patch-file))
-  
-      (define-key menu-bar-file-menu [epatch]
-        '("Apply Patch" . menu-bar-epatch-menu))
-      (define-key menu-bar-file-menu [ediff]
-        '("Find Differences" . menu-bar-ediff-menu))))
+(progn
+  (define-key menu-bar-epatch-menu [ediff-patch-buffer]
+    '("To a Buffer ..." . ediff-patch-buffer))
+  (define-key menu-bar-epatch-menu [ediff-patch-file]
+    '("To a File ..." . ediff-patch-file)))
 
 (if (and window-system ediff-want-default-menus (ediff-frame-has-menubar))
     (if (ediff-if-lucid)