emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103963: lisp/vc/vc.el (ediff-vc-inte


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103963: lisp/vc/vc.el (ediff-vc-internal): Declare function.
Date: Thu, 21 Apr 2011 01:34:00 +0200
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 103963
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-21 01:34:00 +0200
message:
  lisp/vc/vc.el (ediff-vc-internal): Declare function.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-20 22:31:06 +0000
+++ b/lisp/ChangeLog    2011-04-20 23:34:00 +0000
@@ -1,3 +1,7 @@
+2011-04-20  Juanma Barranquero  <address@hidden>
+
+       * vc/vc.el (ediff-vc-internal): Declare function.
+
 2011-04-20  Stefan Monnier  <address@hidden>
 
        * shell.el: Use lexical-binding and std completion UI.

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2011-04-20 17:39:39 +0000
+++ b/lisp/vc/vc.el     2011-04-20 23:34:00 +0000
@@ -1684,6 +1684,8 @@
     (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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]