diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-08-11 21:48:37 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-08-11 21:48:37 +0000 |
| commit | ba93e676087e28b4ec3eed772beeb40125eded7b (patch) | |
| tree | c4892a7fea9d5f1d20ec8c2d2bc078b9f2bdfaa2 /lisp/ediff.el | |
| parent | a83851329cf4b5701b04a4e76deb9bf0598ae9a5 (diff) | |
| download | emacs-ba93e676087e28b4ec3eed772beeb40125eded7b.tar.gz | |
Undo change in condition for defining the menu bar items.
Use purify-flag once again.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index b997674fb3c..88bc230e234 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -1723,16 +1723,16 @@ Do not start with `~/' or `~user-name/'.") ;;; 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 @@ Do not start with `~/' or `~user-name/'.") '("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)) |