Mercurial > emacs

diff lisp/ediff-vers.el @ 93773:d7554c14325c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/lisp/ediff-vers.el	Sun Apr 06 17:30:40 2008 +0000
+++ b/lisp/ediff-vers.el	Sun Apr 06 19:26:02 2008 +0000
@@ -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)
        ))