[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el |
Date: |
Tue, 30 Apr 2002 13:46:00 -0400 |
Index: emacs/lisp/ediff-hook.el
diff -c emacs/lisp/ediff-hook.el:1.20 emacs/lisp/ediff-hook.el:1.21
*** emacs/lisp/ediff-hook.el:1.20 Fri Apr 26 01:17:53 2002
--- emacs/lisp/ediff-hook.el Tue Apr 30 13:46:00 2002
***************
*** 44,50 ****
;; end pacifier
;; allow menus to be set up without ediff-wind.el being loaded
- ;;;###autoload
(defvar ediff-window-setup-function)
;; This macro is used to avoid compilation warnings.
--- 44,49 ----
***************
*** 52,65 ****
;; 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))
;; 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 ()
--- 51,62 ----
***************
*** 82,88 ****
;; 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
--- 79,84 ----