From xemacs-m  Tue Feb 18 17:13:37 1997
Received: from jens.metrix.de (jens@jens.metrix.de [194.123.88.124])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id RAA06795
	for <xemacs-beta@xemacs.org>; Tue, 18 Feb 1997 17:13:34 -0600 (CST)
Received: (from jens@localhost) by jens.metrix.de (8.7.6/8.7.3) id AAA01019; Wed, 19 Feb 1997 00:13:15 +0100
To: xemacs-beta@xemacs.org
Subject: patch for b94 [ediff-init]
X-Face: Z[@OB)("ZvE?ev~1b+b!0ZUB.$%rh.9qE>dVf>q}Q/V?%d`J3gd!LR\aAZ8<Hwi]xTA(:*c;i3,?K?+rCy*^b$)a,}E?eo},}x2]5LlJysyoUOK"o[>K)'\Ulb7y-7*.If^;rHl['oa)n_M7E6w+LDKMs"G8_`c)uOS1^}.1|8Ill]7X68X-paeUOpBhz<F`B0?~^2Et~GYfw~/0]H]nx4~C_E/_mp#^7Ixc:
Reply-To: jens@lemming0.lem.uni-karlsruhe.de
Mime-Version: 1.0 (generated by tm-edit 7.105)
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Feb_19_00:13:12_1997-1"
Content-Transfer-Encoding: 7bit
From: Jens Lautenbacher <jens@metrix.de>
Date: 19 Feb 1997 00:13:12 +0100
Message-ID: <m3ohdh3dyv.fsf@jens.metrix.de>
Lines: 40
X-Mailer: Gnus v5.4.13/XEmacs 19.15

--Multipart_Wed_Feb_19_00:13:12_1997-1
Content-Type: text/plain; charset=US-ASCII



Fixes annoying ange-ftp'ism


--Multipart_Wed_Feb_19_00:13:12_1997-1
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="xempatch"
Content-Transfer-Encoding: 7bit

*** ediff-init.el~	Sun Feb  2 06:05:09 1997
--- ediff-init.el	Tue Feb 18 23:17:26 1997
***************
*** 1157,1165 ****
  ;;; 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))))
  
      
--- 1157,1167 ----
  ;;; In-line functions
  
  (defsubst ediff-file-remote-p (file-name)
    (car (if ediff-xemacs-p
! 	   (progn
! 	     (require 'efs-auto)
! 	     (efs-ftp-path file-name))
! 	 (require 'ange-ftp)
  	 (ange-ftp-ftp-name file-name))))
  
      

--Multipart_Wed_Feb_19_00:13:12_1997-1--

