[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v |
Date: |
Sun, 06 Apr 2008 19:26:07 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/04/06 19:26:05
Index: ediff-vers.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- ediff-vers.el 4 Apr 2008 07:51:25 -0000 1.37
+++ ediff-vers.el 6 Apr 2008 19:26:02 -0000 1.38
@@ -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)
))