Mercurial > emacs
comparison lisp/ediff.el @ 8524:ad46c69956cd
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 | 084456e12635 |
| children | 716969785d08 |
comparison
equal
deleted
inserted
replaced
| 8523:b8d0aeb2de42 | 8524:ad46c69956cd |
|---|---|
| 1721 ;;; only at top level in the file. | 1721 ;;; only at top level in the file. |
| 1722 ;;; So I moved these to top level. But the conditionals on | 1722 ;;; So I moved these to top level. But the conditionals on |
| 1723 ;;; purify-flag make these no-ops when you load ediff. | 1723 ;;; purify-flag make these no-ops when you load ediff. |
| 1724 ;;; They only do something in loaddefs.el. | 1724 ;;; They only do something in loaddefs.el. |
| 1725 ;;;###autoload | 1725 ;;;###autoload |
| 1726 (if (and purify-flag (not (ediff-if-lucid))) | 1726 (if purify-flag |
| 1727 (progn | 1727 (progn |
| 1728 (defvar menu-bar-epatch-menu (make-sparse-keymap "Epatch")) | 1728 (defvar menu-bar-epatch-menu (make-sparse-keymap "Epatch")) |
| 1729 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) | 1729 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
| 1730 (defvar menu-bar-ediff-menu (make-sparse-keymap "Ediff")) | 1730 (defvar menu-bar-ediff-menu (make-sparse-keymap "Ediff")) |
| 1731 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)))) | 1731 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)))) |
| 1732 | 1732 |
| 1733 | 1733 |
| 1734 ;;;###autoload | 1734 ;;;###autoload |
| 1735 (if (and purify-flag (not (ediff-if-lucid))) | 1735 (if purify-flag |
| 1736 (progn | 1736 (progn |
| 1737 (define-key menu-bar-ediff-menu [rcs-ediff] | 1737 (define-key menu-bar-ediff-menu [rcs-ediff] |
| 1738 '("File with a version via RCS ..." . rcs-ediff)) | 1738 '("File with a version via RCS ..." . rcs-ediff)) |
| 1739 (define-key menu-bar-ediff-menu [vc-ediff] | 1739 (define-key menu-bar-ediff-menu [vc-ediff] |
| 1740 '("File with a version via VC ..." . vc-ediff)) | 1740 '("File with a version via VC ..." . vc-ediff)) |
| 1742 '("Buffers ..." . ediff-buffers)) | 1742 '("Buffers ..." . ediff-buffers)) |
| 1743 (define-key menu-bar-ediff-menu [ediff-files] | 1743 (define-key menu-bar-ediff-menu [ediff-files] |
| 1744 '("Files ..." . ediff-files)))) | 1744 '("Files ..." . ediff-files)))) |
| 1745 | 1745 |
| 1746 ;;;###autoload | 1746 ;;;###autoload |
| 1747 (if (and purify-flag (not (ediff-if-lucid))) | 1747 (if purify-flag |
| 1748 (progn | 1748 (progn |
| 1749 (define-key menu-bar-epatch-menu [ediff-patch-buffer] | 1749 (define-key menu-bar-epatch-menu [ediff-patch-buffer] |
| 1750 '("To a Buffer ..." . ediff-patch-buffer)) | 1750 '("To a Buffer ..." . ediff-patch-buffer)) |
| 1751 (define-key menu-bar-epatch-menu [ediff-patch-file] | 1751 (define-key menu-bar-epatch-menu [ediff-patch-file] |
| 1752 '("To a File ..." . ediff-patch-file)))) | 1752 '("To a File ..." . ediff-patch-file)))) |