Commit b9800ec4 authored by Glenn Morris's avatar Glenn Morris
Browse files

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

(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.
parent c18e885b
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).
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment