From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 20 Apr 2011 23:34:00 +0000 (+0200)
Subject: lisp/vc/vc.el (ediff-vc-internal): Declare function.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~215^2~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80f499c7c1cae0e008400b2a2fe443a1a7621ce5;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70bb631df9e..ea762d06982 100644
--- 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 1639cd7b1b1..3809b5b4293 100644
--- 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