Mercurial > emacs

changeset 8524:ad46c69956cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undo change in condition for defining the menu bar items. Use purify-flag once again.
author Richard M. Stallman <rms@gnu.org>
date Thu, 11 Aug 1994 21:48:37 +0000
parents b8d0aeb2de42
children fcc070bca96d
files lisp/ediff.el
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff.el	Thu Aug 11 21:46:50 1994 +0000
+++ b/lisp/ediff.el	Thu Aug 11 21:48:37 1994 +0000
@@ -1723,16 +1723,16 @@
 ;;; purify-flag make these no-ops when you load ediff.
 ;;; They only do something in loaddefs.el.
 ;;;###autoload
-(if (and purify-flag (not (ediff-if-lucid)))
-  (progn
-    (defvar menu-bar-epatch-menu (make-sparse-keymap "Epatch"))
-    (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
-    (defvar menu-bar-ediff-menu (make-sparse-keymap "Ediff"))
-    (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))))
+(if purify-flag
+    (progn
+      (defvar menu-bar-epatch-menu (make-sparse-keymap "Epatch"))
+      (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
+      (defvar menu-bar-ediff-menu (make-sparse-keymap "Ediff"))
+      (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))))
 
 
 ;;;###autoload
-(if (and purify-flag (not (ediff-if-lucid)))
+(if purify-flag
     (progn
       (define-key menu-bar-ediff-menu [rcs-ediff]
 	'("File with a version via RCS ..." . rcs-ediff))
@@ -1744,7 +1744,7 @@
 	'("Files ..." . ediff-files))))
 
 ;;;###autoload
-(if (and purify-flag (not (ediff-if-lucid)))
+(if purify-flag
     (progn
       (define-key menu-bar-epatch-menu [ediff-patch-buffer]
 	'("To a Buffer ..." . ediff-patch-buffer))