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 |
47 |
|
;;;###autoload |
48 |
(defvar ediff-window-setup-function) |
(defvar ediff-window-setup-function) |
49 |
|
|
50 |
;; This macro is used to avoid compilation warnings. |
;; This macro is used to avoid compilation warnings. |
52 |
;; compiler at hand (emacs or xemacs). |
;; compiler at hand (emacs or xemacs). |
53 |
;; The autoload, below, is useless in Emacs because ediff-hook.el |
;; The autoload, below, is useless in Emacs because ediff-hook.el |
54 |
;; is dumped with emacs, but it is needed in XEmacs |
;; is dumped with emacs, but it is needed in XEmacs |
55 |
|
;;;###autoload |
56 |
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
57 |
(if (string-match "XEmacs" emacs-version) |
(if (string-match "XEmacs" emacs-version) |
58 |
xemacs-form emacs-form)) |
xemacs-form emacs-form)) |
59 |
|
|
60 |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
61 |
;; emacs, but it is needed in XEmacs |
;; emacs, but it is needed in XEmacs |
62 |
|
;;;###autoload |
63 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
64 |
;; xemacs form |
;; xemacs form |
65 |
(defun ediff-xemacs-init-menus () |
(defun ediff-xemacs-init-menus () |
82 |
|
|
83 |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
84 |
;; emacs, but it is needed in XEmacs |
;; emacs, but it is needed in XEmacs |
85 |
|
;;;###autoload |
86 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
87 |
(progn |
(progn |
88 |
(defvar ediff-menu |
(defvar ediff-menu |