From xemacs-m  Fri Jan 24 09:29:33 1997
Received: from macon.informatik.uni-tuebingen.de (macon2.Informatik.Uni-Tuebingen.De [134.2.13.2])
          by xemacs.org (8.8.4/8.8.4) with SMTP
	  id JAA21149 for <xemacs-beta@xemacs.org>; Fri, 24 Jan 1997 09:29:32 -0600 (CST)
Received: from modas.Informatik.Uni-Tuebingen.De by macon.informatik.uni-tuebingen.de (AIX 4.1/UCB 5.64/4.03)
          id AA18320; Fri, 24 Jan 1997 16:29:24 +0100
Received: by modas.informatik.uni-tuebingen.de (AIX 4.1/UCB 5.64/4.03)
          id AA23232; Fri, 24 Jan 1997 16:29:22 +0100
Sender: sperber@informatik.uni-tuebingen.de
To: xemacs-beta@xemacs.org
Cc: kifer@cs.sunysb.edu
Subject: ediff and EFS
Mime-Version: 1.0 (generated by tm-edit 7.100)
Content-Type: text/plain; charset=US-ASCII
From: sperber@informatik.uni-tuebingen.de (Michael Sperber [Mr. Preprocessor])
Date: 24 Jan 1997 16:29:21 +0100
Message-Id: <y9l4tg7hz1q.fsf@modas.informatik.uni-tuebingen.de>
Lines: 53
X-Mailer: Red Gnus v0.82/XEmacs 20.0


Here's what I think needs to be done to make ediff work with EFS.  I
hope it's enough politically correct.  It sure looks awful to me.

Cheers =8-} Mike

*** lisp/ediff/ediff-init.el.orig       Fri Jan 24 16:01:27 1997
--- lisp/ediff/ediff-init.el    Fri Jan 24 16:13:11 1997
***************
*** 35,41 ****
  
  (and noninteractive
       (eval-when-compile
!        (load "ange-ftp" 'noerror)))
  ;; end pacifier
  
  ;; Is it XEmacs?
--- 35,42 ----
  
  (and noninteractive
       (eval-when-compile
!        (or (load "efs" 'noerror)
!          (load "ange-ftp" 'noerror))))
  ;; end pacifier
  
  ;; Is it XEmacs?
***************
*** 1157,1166 ****
  ;;; In-line functions
  
  (defsubst ediff-file-remote-p (file-name)
!   (require 'ange-ftp)
!   (car (if ediff-xemacs-p
!          (ange-ftp-ftp-path file-name)
!        (ange-ftp-ftp-name file-name))))
  
      
  (defsubst ediff-frame-unsplittable-p (frame)
--- 1158,1171 ----
  ;;; In-line functions
  
  (defsubst ediff-file-remote-p (file-name)
!   (condition-case nil
!       (require 'efs)
!     (t (require 'ange-ftp)))
!   (car (if (fboundp 'efs-ftp-path)
!          (efs-ftp-path file-name)
!        (if ediff-xemacs-p
!            (ange-ftp-ftp-path file-name)
!          (ange-ftp-ftp-name file-name)))))
  
      
  (defsubst ediff-frame-unsplittable-p (frame)

