Mercurial > hg > xemacs-beta
diff lisp/ediff/ediff-ptch.el @ 82:6a378aca36af r20-0b91
Import from CVS: tag r20-0b91
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:07:36 +0200 |
parents | 1ce6082ce73f |
children | 34a5b81f86ba |
line wrap: on
line diff
--- a/lisp/ediff/ediff-ptch.el Mon Aug 13 09:06:45 2007 +0200 +++ b/lisp/ediff/ediff-ptch.el Mon Aug 13 09:07:36 2007 +0200 @@ -1,6 +1,6 @@ ;;; ediff-ptch.el --- Ediff's patch support -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.sunysb.edu> @@ -34,13 +34,11 @@ (defvar ediff-shell) (eval-when-compile - (let ((load-path (cons "." load-path))) + (let ((load-path (cons (expand-file-name ".") load-path))) (or (featurep 'ediff-init) (load "ediff-init.el" nil nil 'nosuffix)) (or (featurep 'ediff) (load "ediff.el" nil nil 'nosuffix)) - (or (featurep 'ange-ftp) - (load "ange-ftp" 'noerror)) )) ;; end pacifier