[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff.el,v |
Date: |
Fri, 04 Apr 2008 07:51:32 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/04/04 07:51:30
Index: ediff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- ediff.el 10 Jan 2008 06:54:11 -0000 1.96
+++ ediff.el 4 Apr 2008 07:51:25 -0000 1.97
@@ -107,30 +107,30 @@
;;; Code:
+(provide 'ediff)
;; Compiler pacifier
(defvar cvs-cookie-handle)
(defvar ediff-last-dir-patch)
(defvar ediff-patch-default-directory)
+(defvar ediff-control-window)
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(eval-when-compile
- (and noninteractive
- (load "dired" nil t))
- (let ((load-path (cons (expand-file-name ".") load-path)))
- (provide 'ediff) ; to break recursive load cycle
- (or (featurep 'ediff-init)
- (load "ediff-init.el" nil t 'nosuffix))
- (or (featurep 'ediff-mult)
- (load "ediff-mult.el" nil t 'nosuffix))
- (or (featurep 'ediff-ptch)
- (load "ediff-ptch.el" nil t 'nosuffix))
- (or (featurep 'ediff-vers)
- (load "ediff-vers.el" nil t 'nosuffix))
- ))
+ (require 'dired)
+ (require 'ediff-init)
+ (if (not (featurep 'ediff-mult))
+ (require 'ediff-mult))
+ (if (not (featurep 'ediff-util))
+ (require 'ediff-util))
+ (require 'ediff-wind)
+ (if (not (featurep 'ediff-ptch))
+ (require 'ediff-ptch))
+ (require 'ediff-vers)
+ )
;; end pacifier
(require 'ediff-init)
@@ -1513,8 +1513,6 @@
(run-hooks 'ediff-load-hook)
-(provide 'ediff)
-
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
- [Emacs-diffs] Changes to emacs/lisp/ediff.el,v,
Michael Kifer <=