--- a/lisp/ediff/ediff-help.el	Mon Aug 13 08:48:18 2007 +0200
+++ b/lisp/ediff/ediff-help.el	Mon Aug 13 08:48:42 2007 +0200
@@ -22,17 +22,21 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
-
-(require 'ediff-init)
+	 
+(provide 'ediff-help)
 
 ;; Compiler pacifier start
 (defvar ediff-multiframe)
-(and noninteractive
-     (eval-when-compile
-       (let ((load-path (cons (expand-file-name ".") load-path)))
-	 (load-file "ediff-init.el"))))
+
+(eval-when-compile
+  (let ((load-path (cons "." load-path)))
+    (or (featurep 'ediff-init)
+	(load "ediff-init.el" nil nil 'nosuffix))
+    ))
 ;; end pacifier
 
+(require 'ediff-init)
+
 ;; Help messages
 
 (defconst ediff-long-help-message-head
@@ -178,8 +182,7 @@
   "Explain Ediff commands in more detail."
   (interactive)
   (ediff-barf-if-not-control-buffer)
-  (let ((ctl-buf (current-buffer))
-	(pos (ediff-event-point last-command-event))
+  (let ((pos (ediff-event-point last-command-event))
 	overl cmd)
 
     (if ediff-xemacs-p
@@ -306,6 +309,5 @@
 			     ediff-brief-help-message))
   (run-hooks 'ediff-display-help-hook))
 
-(provide 'ediff-help)
 
 ;;; ediff-help.el ends here