Mercurial > emacs
comparison lisp/ediff-hook.el @ 47520:a37b476e1aec
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Wed, 18 Sep 2002 04:23:27 +0000 |
| parents | be3792216418 |
| children | be6ae2adff50 |
comparison
equal
deleted
inserted
replaced
| 47519:1ddc3c34180d | 47520:a37b476e1aec |
|---|---|
| 42 (defvar epatch-menu) | 42 (defvar epatch-menu) |
| 43 (defvar ediff-misc-menu) | 43 (defvar ediff-misc-menu) |
| 44 ;; end pacifier | 44 ;; end pacifier |
| 45 | 45 |
| 46 ;; allow menus to be set up without ediff-wind.el being loaded | 46 ;; allow menus to be set up without ediff-wind.el being loaded |
| 47 ;;;###autoload | |
| 47 (defvar ediff-window-setup-function) | 48 (defvar ediff-window-setup-function) |
| 48 | 49 |
| 49 ;; This macro is used to avoid compilation warnings. | 50 ;; This macro is used to avoid compilation warnings. |
| 50 ;; The macro will expand into the form that is appropriate to the | 51 ;; The macro will expand into the form that is appropriate to the |
| 51 ;; compiler at hand (emacs or xemacs). | 52 ;; compiler at hand (emacs or xemacs). |
| 52 ;; The autoload, below, is useless in Emacs because ediff-hook.el | 53 ;; The autoload, below, is useless in Emacs because ediff-hook.el |
| 53 ;; is dumped with emacs, but it is needed in XEmacs | 54 ;; is dumped with emacs, but it is needed in XEmacs |
| 55 ;;;###autoload | |
| 54 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) | 56 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
| 55 (if (string-match "XEmacs" emacs-version) | 57 (if (string-match "XEmacs" emacs-version) |
| 56 xemacs-form emacs-form)) | 58 xemacs-form emacs-form)) |
| 57 | 59 |
| 58 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with | 60 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
| 59 ;; emacs, but it is needed in XEmacs | 61 ;; emacs, but it is needed in XEmacs |
| 62 ;;;###autoload | |
| 60 (ediff-cond-compile-for-xemacs-or-emacs | 63 (ediff-cond-compile-for-xemacs-or-emacs |
| 61 ;; xemacs form | 64 ;; xemacs form |
| 62 (defun ediff-xemacs-init-menus () | 65 (defun ediff-xemacs-init-menus () |
| 63 (if (featurep 'menubar) | 66 (if (featurep 'menubar) |
| 64 (progn | 67 (progn |
| 77 ) | 80 ) |
| 78 | 81 |
| 79 | 82 |
| 80 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with | 83 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
| 81 ;; emacs, but it is needed in XEmacs | 84 ;; emacs, but it is needed in XEmacs |
| 85 ;;;###autoload | |
| 82 (ediff-cond-compile-for-xemacs-or-emacs | 86 (ediff-cond-compile-for-xemacs-or-emacs |
| 83 (progn | 87 (progn |
| 84 (defvar ediff-menu | 88 (defvar ediff-menu |
| 85 '("Compare" | 89 '("Compare" |
| 86 ["Two Files..." ediff-files t] | 90 ["Two Files..." ediff-files t] |