lisp/vc/vc.el (ediff-vc-internal): Declare function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70bb631df9ea41098ebc8781814bd3ac17d99475..ea762d069823a2dad8b4d8522a34f862ccaf937e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-20  Juanma Barranquero  <lekktu@gmail.com>
+
+       * vc/vc.el (ediff-vc-internal): Declare function.
+
 2011-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * shell.el: Use lexical-binding and std completion UI.

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 1639cd7b1b138955ba05adda9547a6dec240a229..3809b5b429374a9de04fca9ffcc815a6ee30812c 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1684,6 +1684,8 @@ 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))
+
 ;;;###autoload
 (defun vc-version-ediff (files rev1 rev2)
   "Show differences between revisions of the fileset in the