2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff*el: replaced load with require in eval-when-compile.

	* ediff-hook: deleted all invocations of (autoload ...).

	* ediff-util.el (ediff-setup): make window-min-height a local variable
	in ediff control window, and set its min height to 2.
	(ediff-setup-control-buffer): dedicate the control window.
	(ediff-toggle-multiframe): undedicate control window.
	Work directly with ediff-setup-windows-multiframe and
	ediff-setup-windows-plain.

	* ediff-wind (ediff-choose-window-setup-function-automatically): new
	function.
	(ediff-window-setup-function): change initialization.
	(ediff-setup-windows-automatic): deleted.
	(ediff-setup-windows-plain-merge): make control window dedicated.
	(ediff-destroy-control-frame): do not skip frames if working in a
	single frame.

	* emulation/viper-ex.el: move provide's forward, prevent ecursion in
	eval-when-compile.

	* emulation/viper-util.el: move provide's forward, prevent ecursion in
	eval-when-compile.

1 files changed, 6 insertions, 8 deletions

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 00060a9e974..04d2697c911 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -27,18 +27,18 @@
 ;;; Code:
 
 
+(provide 'ediff-diff)
+
 ;; compiler pacifier
 (defvar ediff-default-variant)
 (defvar null-device)
 (defvar longlines-mode)
 
 (eval-when-compile
-  (let ((load-path (cons (expand-file-name ".") load-path)))
-    (or (featurep 'ediff-init)
-	(load "ediff-init.el" nil t 'nosuffix))
-    (or (featurep 'ediff-util)
-	(load "ediff-util.el" nil t 'nosuffix))
-    ))
+  (require 'ediff-init)
+  (if (not (featurep 'ediff-util))
+      (require 'ediff-util))
+  )
 ;; end pacifier
 
 (require 'ediff-init)
@@ -1536,8 +1536,6 @@ affects only files whose names match the expression."
   )
 
 
-(provide 'ediff-diff)
-
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)