diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-06 19:26:02 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-06 19:26:02 +0000 |
| commit | a5254f378911515c8b19ac4d4be0877c835f1586 (patch) | |
| tree | 94316ba0dfc2cfb7c44e6859b6810916bf34bc3f /lisp/ediff-vers.el | |
| parent | 4dc2220833024c4c40ad52510ec8d6d6f3cf8769 (diff) | |
| download | emacs-a5254f378911515c8b19ac4d4be0877c835f1586.tar.gz | |
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
* viper*.el (viper-search-wrap-around-t): replace with
viper-search-wrap-around.
* ediff*.el: replace 3-argument 'require' statements with 1-argument
ones (wrapped in if's). For compatibility with the current stable
version of XEmacs.
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 80a748ce65e..a7a8ff644a1 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -36,8 +36,14 @@ (and noninteractive (eval-when-compile - (require 'pcvs nil 'noerror) - (require 'rcs nil 'noerror) + (condition-case nil + ;; for compatibility with current stable version of xemacs + (progn + ;;(require 'pcvs nil 'noerror) + ;;(require 'rcs nil 'noerror) + (require 'pcvs) + (require 'rcs)) + (error nil)) (require 'vc) (require 'ediff-init) )) |