aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-11 15:02:29 -0800
committerGlenn Morris2012-02-11 15:02:29 -0800
commit6d216d7f115365eb0e2e423e0b3a55083b4e663d (patch)
tree4ff44076afbecc4f9ccb6693f30b80f562dec53b
parent584745030f2fc93f4f473c5d3dfb36ebe92851a1 (diff)
downloademacs-6d216d7f115365eb0e2e423e0b3a55083b4e663d.tar.gz
emacs-6d216d7f115365eb0e2e423e0b3a55083b4e663d.zip
* log-view.el (vc-diff-internal): Remove unneeded (and incorrect) declaration.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc/log-view.el3
2 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d62cfb1a116..c17384d9d23 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-02-11 Glenn Morris <rgm@gnu.org> 12012-02-11 Glenn Morris <rgm@gnu.org>
2 2
3 * vc/log-view.el (vc-diff-internal): Remove unneeded declaration.
4
3 * window.el (window-sides-slots): 5 * window.el (window-sides-slots):
4 * tool-bar.el (tool-bar-position): 6 * tool-bar.el (tool-bar-position):
5 * term/xterm.el (xterm-extra-capabilities): 7 * term/xterm.el (xterm-extra-capabilities):
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 7512c9283eb..d345a20a0f5 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -561,9 +561,6 @@ changeset that affected the currently considered file(s)."
561 log-view-vc-fileset)) 561 log-view-vc-fileset))
562 to fr))) 562 to fr)))
563 563
564(declare-function vc-diff-internal "vc"
565 (async vc-fileset rev1 rev2 &optional verbose))
566
567(defun log-view-diff-changeset (beg end) 564(defun log-view-diff-changeset (beg end)
568 "Get the diff between two revisions. 565 "Get the diff between two revisions.
569If the mark is not active or the mark is on the revision at point, 566If the mark is not active or the mark is on the revision at point,