Mercurial > emacs

comparison lisp/ediff-diff.el @ 90203:187d6a1f84f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 485-492) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 92-94) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 22 Jul 2005 08:27:27 +0000
parents fbb2bea03df9 a289f81ac7e5
children 2d92f5c9d6ae
comparison
equal deleted inserted replaced
90202:7597b4a23c3b 90203:187d6a1f84f7
28 (provide 'ediff-diff) 28 (provide 'ediff-diff)
29 29
30 ;; compiler pacifier 30 ;; compiler pacifier
31 (defvar ediff-default-variant) 31 (defvar ediff-default-variant)
32 (defvar null-device) 32 (defvar null-device)
33 (defvar longlines-mode)
33 34
34 (eval-when-compile 35 (eval-when-compile
35 (let ((load-path (cons (expand-file-name ".") load-path))) 36 (let ((load-path (cons (expand-file-name ".") load-path)))
36 (or (featurep 'ediff-init) 37 (or (featurep 'ediff-init)
37 (load "ediff-init.el" nil nil 'nosuffix)) 38 (load "ediff-init.el" nil nil 'nosuffix))