Mercurial > hg > xemacs-beta

diff lisp/ediff/ediff-vers.el @ 82:6a378aca36af r20-0b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children bfd6434d15b3
line wrap: on
line diff
--- a/lisp/ediff/ediff-vers.el	Mon Aug 13 09:06:45 2007 +0200
+++ b/lisp/ediff/ediff-vers.el	Mon Aug 13 09:07:36 2007 +0200
@@ -1,6 +1,6 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;;; Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+;;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 
@@ -32,11 +32,12 @@
 (defvar cvs-cookie-handle)
 (defvar ediff-temp-file-prefix)
 
-(eval-when-compile
-  (load "pcl-cvs" 'noerror)
-  (load "rcs" 'noerror)
-  (load "generic-sc" 'noerror)
-  (load "vc" 'noerror))
+(and noninteractive
+     (eval-when-compile
+       (load "pcl-cvs" 'noerror)
+       (load "rcs" 'noerror)
+       (load "generic-sc" 'noerror)
+       (load "vc" 'noerror)))
 ;; end pacifier
       
 ;; VC.el support