diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-09-18 04:23:27 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-09-18 04:23:27 +0000 |
| commit | d9687e70cabacef76144c4df5e5919b206dee251 (patch) | |
| tree | 02d13c192ec8d2bc086586515b7ec1ea928e299b /lisp/ediff-hook.el | |
| parent | fe462fbe192e7ec6345a2c5acf52b109b6758a4f (diff) | |
| download | emacs-d9687e70cabacef76144c4df5e5919b206dee251.tar.gz | |
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-hooks.el: Put back the autoloads (for compatibility with XEmacs).
* ediff-init.el: Use defalias instead of fset.
* ediff-util.el: Use defalias instead of fset.
* viper-util.el (viper-chars-in-region): simplification.
* viper.el (viper-emacs-state-mode-list): added modes.
Diffstat (limited to 'lisp/ediff-hook.el')
| -rw-r--r-- | lisp/ediff-hook.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index daae55827a9..23baeb49d7d 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -44,6 +44,7 @@ ;; 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. @@ -51,12 +52,14 @@ ;; 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 () @@ -79,6 +82,7 @@ ;; 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 |