Mercurial > emacs
comparison lisp/ediff-vers.el @ 93773:d7554c14325c
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 06 Apr 2008 19:26:02 +0000 |
| parents | 6523ed37006c |
| children | 1e3a407766b9 |
comparison
equal
deleted
inserted
replaced
| 93772:061a2121a7e8 | 93773:d7554c14325c |
|---|---|
| 34 (defvar cvs-cookie-handle) | 34 (defvar cvs-cookie-handle) |
| 35 (defvar ediff-temp-file-prefix) | 35 (defvar ediff-temp-file-prefix) |
| 36 | 36 |
| 37 (and noninteractive | 37 (and noninteractive |
| 38 (eval-when-compile | 38 (eval-when-compile |
| 39 (require 'pcvs nil 'noerror) | 39 (condition-case nil |
| 40 (require 'rcs nil 'noerror) | 40 ;; for compatibility with current stable version of xemacs |
| 41 (progn | |
| 42 ;;(require 'pcvs nil 'noerror) | |
| 43 ;;(require 'rcs nil 'noerror) | |
| 44 (require 'pcvs) | |
| 45 (require 'rcs)) | |
| 46 (error nil)) | |
| 41 (require 'vc) | 47 (require 'vc) |
| 42 (require 'ediff-init) | 48 (require 'ediff-init) |
| 43 )) | 49 )) |
| 44 ;; end pacifier | 50 ;; end pacifier |
| 45 | 51 |