Skip to content

GitLab

Commit abdb213c authored by Michael Kifer's avatar Michael Kifer
Browse files

2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu> 

	* ediff-hooks.el: Put back the autoloads.
parent fece59b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 108 deletions
lisp/ChangeLog
View file @ abdb213c
This diff is collapsed.
lisp/ediff-hook.el
View file @ abdb213c
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment