44 |
;; end pacifier |
;; end pacifier |
45 |
|
|
46 |
;; allow menus to be set up without ediff-wind.el being loaded |
;; allow menus to be set up without ediff-wind.el being loaded |
|
;;;###autoload |
|
47 |
(defvar ediff-window-setup-function) |
(defvar ediff-window-setup-function) |
48 |
|
|
49 |
;; This is used to avoid compilation warnings. When emacs/xemacs forms can |
;; This is used to avoid compilation warnings. When emacs/xemacs forms can |
51 |
;; In this case, the macro will expand into the form that is appropriate to the |
;; In this case, the macro will expand into the form that is appropriate to the |
52 |
;; compiler at hand. |
;; compiler at hand. |
53 |
;; Suggested by rms. |
;; Suggested by rms. |
|
;;;###autoload |
|
54 |
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
55 |
(if (string-match "XEmacs" emacs-version) |
(if (string-match "XEmacs" emacs-version) |
56 |
xemacs-form emacs-form)) |
xemacs-form emacs-form)) |
58 |
;; Note we wrap this in a progn so that we pick up the whole def |
;; Note we wrap this in a progn so that we pick up the whole def |
59 |
;; for auto-autoload. That way we do not load ediff-hook.el when defining |
;; for auto-autoload. That way we do not load ediff-hook.el when defining |
60 |
;; the menus. |
;; the menus. |
|
;;;###autoload |
|
61 |
(progn |
(progn |
62 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
63 |
;; xemacs form |
;; xemacs form |
79 |
)) |
)) |
80 |
|
|
81 |
|
|
|
;;;###autoload |
|
82 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
83 |
(progn |
(progn |
84 |
(defvar ediff-menu |
(defvar ediff-menu |