* lisp/vc/vc.el: No need to require ediff.

(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e51c67e8e8078d940cd660e10f7a64baa9b49e9..62ba701716372eeedf8a17aaaebc7e642719e6a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-13  Glenn Morris  <rgm@gnu.org>
+
+       * vc/vc.el: No need to require ediff.
+       (ediff-load-version-control): Declare.
+       (ediff-vc-internal): Fix declaration.
+       (vc-version-ediff): Require ediff.
+
 2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use a more backwards-compatible timer format (Bug#12430).

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 1ef4faaa0081cb6eefea6507fb7500585a9c719f..47800bd4aaceae640ac2f851e1506c46eebd5c89 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -653,7 +653,6 @@
 
 (require 'vc-hooks)
 (require 'vc-dispatcher)
-(require 'ediff)
 
 (declare-function diff-setup-whitespace "diff-mode" ())
 
@@ -1698,7 +1697,9 @@ saving the buffer."
     (vc-diff-internal t (vc-deduce-fileset t) nil nil
                      (called-interactively-p 'interactive))))
 
-(declare-function ediff-vc-internal (rev1 rev2 &optional startup-hooks))
+(declare-function ediff-load-version-control "ediff" (&optional silent))
+(declare-function ediff-vc-internal "ediff-vers"
+                  (rev1 rev2 &optional startup-hooks))
 
 ;;;###autoload
 (defun vc-version-ediff (files rev1 rev2)
@@ -1719,7 +1720,8 @@ repository history using ediff."
    ;; FIXME We only support running ediff on one file for now.
    ;; We could spin off an ediff session per file in the file set.
    ((= (length files) 1)
-    (ediff-load-version-control)
+    (require 'ediff)
+    (ediff-load-version-control)  ; loads ediff-vers
     (find-file (car files))             ;FIXME: find-file from Elisp is bad.
     (ediff-vc-internal rev1 rev2 nil))
    (t