# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 768905962 0
# Node ID 52b5bb0c70e8fc3f40abfef8ba4a874c135a7fc2
# Parent  266bf374a7bf4257cefcb47cd4eb1d8a3b25ac04
Make menu bar defines unconditional.
Don't alter menu-bar-files-menu here; menu-bar.el does that.

diff -r 266bf374a7bf -r 52b5bb0c70e8 lisp/ediff.el
--- a/lisp/ediff.el	Sat May 14 08:33:26 1994 +0000
+++ b/lisp/ediff.el	Sat May 14 08:59:22 1994 +0000
@@ -1456,37 +1456,29 @@
 ;;; 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)