diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-04-26 05:17:53 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-04-26 05:17:53 +0000 |
| commit | abdb213cb6b0a8faf01c2f9b3a6f028271a95dfb (patch) | |
| tree | 96088bc78c6664ee943a2c77ac65632d1ce1c07d /lisp/ediff-hook.el | |
| parent | fece59b88cf8fdc4b8e5dfd75e19a2dce5c736fc (diff) | |
| download | emacs-abdb213cb6b0a8faf01c2f9b3a6f028271a95dfb.tar.gz emacs-abdb213cb6b0a8faf01c2f9b3a6f028271a95dfb.tar.bz2 emacs-abdb213cb6b0a8faf01c2f9b3a6f028271a95dfb.zip | |
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-hooks.el: Put back the autoloads.
Diffstat (limited to 'lisp/ediff-hook.el')
| -rw-r--r-- | lisp/ediff-hook.el | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 3bf006d9c1d..23baeb49d7d 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -44,41 +44,45 @@ ;; end pacifier ;; allow menus to be set up without ediff-wind.el being loaded +;;;###autoload (defvar ediff-window-setup-function) -;; This is used to avoid compilation warnings. When emacs/xemacs forms can -;; generate compile time warnings, we use this macro. -;; In this case, the macro will expand into the form that is appropriate to the -;; compiler at hand. -;; Suggested by rms. +;; This macro is used to avoid compilation warnings. +;; The macro will expand into the form that is appropriate to the +;; compiler at hand (emacs or xemacs). +;; The autoload, below, is useless in Emacs because ediff-hook.el +;; is dumped with emacs, but it is needed in XEmacs +;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form)) -;; Note we wrap this in a progn so that we pick up the whole def -;; for auto-autoload. That way we do not load ediff-hook.el when defining -;; the menus. -(progn - (ediff-cond-compile-for-xemacs-or-emacs - ;; xemacs form - (defun ediff-xemacs-init-menus () - (if (featurep 'menubar) - (progn - (add-submenu - '("Tools") ediff-menu "OO-Browser...") - (add-submenu - '("Tools") ediff-merge-menu "OO-Browser...") - (add-submenu - '("Tools") epatch-menu "OO-Browser...") - (add-submenu - '("Tools") ediff-misc-menu "OO-Browser...") - (add-menu-button - '("Tools") "-------" "OO-Browser...") - ))) - nil ; emacs form - )) - - +;; This autoload is useless in Emacs because ediff-hook.el is dumped with +;; emacs, but it is needed in XEmacs +;;;###autoload +(ediff-cond-compile-for-xemacs-or-emacs + ;; xemacs form + (defun ediff-xemacs-init-menus () + (if (featurep 'menubar) + (progn + (add-submenu + '("Tools") ediff-menu "OO-Browser...") + (add-submenu + '("Tools") ediff-merge-menu "OO-Browser...") + (add-submenu + '("Tools") epatch-menu "OO-Browser...") + (add-submenu + '("Tools") ediff-misc-menu "OO-Browser...") + (add-menu-button + '("Tools") "-------" "OO-Browser...") + ))) + nil ; emacs form + ) + + +;; This autoload is useless in Emacs because ediff-hook.el is dumped with +;; emacs, but it is needed in XEmacs +;;;###autoload (ediff-cond-compile-for-xemacs-or-emacs (progn (defvar ediff-menu |