diff options
| author | Juanma Barranquero <[email protected]> | 2011-04-21 01:34:00 +0200 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2011-04-21 01:34:00 +0200 |
| commit | 80f499c7c1cae0e008400b2a2fe443a1a7621ce5 (patch) | |
| tree | 934929dea744a5db7dc6d50185aaab30b4e32f23 /lisp | |
| parent | c0a193ea2017fbaa6fb3e64a07125878656da156 (diff) | |
lisp/vc/vc.el (ediff-vc-internal): Declare function.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70bb631df9..ea762d0698 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-04-20 Juanma Barranquero <[email protected]> + + * vc/vc.el (ediff-vc-internal): Declare function. + 2011-04-20 Stefan Monnier <[email protected]> * shell.el: Use lexical-binding and std completion UI. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 1639cd7b1b..3809b5b429 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 |