diff options
| author | Glenn Morris <[email protected]> | 2012-09-13 14:23:33 -0400 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-09-13 14:23:33 -0400 |
| commit | b9800ec43b3e7f17cde08dc890afa690185cf9aa (patch) | |
| tree | b279358869b107ad1eef3c44e1ca8d1d0fa2b038 /lisp/vc | |
| parent | c18e885bdd2607ec1784c3e1585e581459408932 (diff) | |
* lisp/vc/vc.el: No need to require ediff.
(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 1ef4faaa00..47800bd4aa 100644 --- 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 |