Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-diff.el @ 16:0293115a14e9 r19-15b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 9ee227acff29
children 131b0175ea99
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
1 ;;; ediff-diff.el --- diff-related utilities 1 ;;; ediff-diff.el --- diff-related utilities
2 2
3 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 1995, 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
27 27
28 ;; compiler pacifier 28 ;; compiler pacifier
29 (defvar ediff-default-variant) 29 (defvar ediff-default-variant)
30 30
31 (eval-when-compile 31 (eval-when-compile
32 (let ((load-path (cons "." load-path))) 32 (let ((load-path (cons (expand-file-name ".") load-path)))
33 (or (featurep 'ediff-init) 33 (or (featurep 'ediff-init)
34 (load "ediff-init.el" nil nil 'nosuffix)) 34 (load "ediff-init.el" nil nil 'nosuffix))
35 (or (featurep 'ediff-util) 35 (or (featurep 'ediff-util)
36 (load "ediff-util.el" nil nil 'nosuffix)) 36 (load "ediff-util.el" nil nil 'nosuffix))
37 )) 37 ))