Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-ptch.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 34a5b81f86ba
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
1 ;;; ediff-ptch.el --- Ediff's patch support 1 ;;; ediff-ptch.el --- Ediff's patch support
2 2
3 ;; Copyright (C) 1996 Free Software Foundation, Inc. 3 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 6
7 ;; This file is part of GNU Emacs. 7 ;; This file is part of GNU Emacs.
8 8
32 (defvar ediff-window-C) 32 (defvar ediff-window-C)
33 (defvar ediff-use-last-dir) 33 (defvar ediff-use-last-dir)
34 (defvar ediff-shell) 34 (defvar ediff-shell)
35 35
36 (eval-when-compile 36 (eval-when-compile
37 (let ((load-path (cons "." load-path))) 37 (let ((load-path (cons (expand-file-name ".") load-path)))
38 (or (featurep 'ediff-init) 38 (or (featurep 'ediff-init)
39 (load "ediff-init.el" nil nil 'nosuffix)) 39 (load "ediff-init.el" nil nil 'nosuffix))
40 (or (featurep 'ediff) 40 (or (featurep 'ediff)
41 (load "ediff.el" nil nil 'nosuffix)) 41 (load "ediff.el" nil nil 'nosuffix))
42 (or (featurep 'ange-ftp)
43 (load "ange-ftp" 'noerror))
44 )) 42 ))
45 ;; end pacifier 43 ;; end pacifier
46 44
47 (require 'ediff-init) 45 (require 'ediff-init)
48 46