[Emacs-diffs] /srv/bzr/emacs/trunk r110019: * lisp/vc/vc.el: No need to require ediff.

[Glenn Morris]

------------------------------------------------------------
revno: 110019
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-13 14:23:33 -0400
message:
  * lisp/vc/vc.el: No need to require ediff.
  (ediff-load-version-control): Declare.
  (ediff-vc-internal): Fix declaration.
  (vc-version-ediff): Require ediff.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-13 16:23:06 +0000
+++ b/lisp/ChangeLog    2012-09-13 18:23:33 +0000
@@ -1,3 +1,10 @@
+2012-09-13  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Use a more backwards-compatible timer format (Bug#12430).

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2012-08-29 15:11:51 +0000
+++ b/lisp/vc/vc.el     2012-09-13 18:23:33 +0000
@@ -653,7 +653,6 @@
 
 (require 'vc-hooks)
 (require 'vc-dispatcher)
-(require 'ediff)
 
 (declare-function diff-setup-whitespace "diff-mode" ())
 
@@ -1698,7 +1697,9 @@
     (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 @@
    ;; 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