aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-10-05 15:09:59 +0000
committerDan Nicolaescu2009-10-05 15:09:59 +0000
commitc66b7ac005b4bfc923764dce8c492ed7b9171ef1 (patch)
tree98aad55c1e6056fb5463709abb9ad4d73f658a85
parent2a3f19ef9795e8f51db4b10f35ae7bf9d9727898 (diff)
downloademacs-c66b7ac005b4bfc923764dce8c492ed7b9171ef1.tar.gz
emacs-c66b7ac005b4bfc923764dce8c492ed7b9171ef1.zip
(log-view-diff): Use vc-diff-internal instead of
vc-version-diff. (vc-diff-internal): Autoload this instead of vc-version-diff.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/log-view.el13
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0e95db2b88..560ec8e09a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-10-05 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * log-view.el (log-view-diff): Use vc-diff-internal instead of
4 vc-version-diff.
5 (vc-diff-internal): Autoload this instead of vc-version-diff.
6
12009-10-05 Eli Zaretskii <eliz@gnu.org> 72009-10-05 Eli Zaretskii <eliz@gnu.org>
2 8
3 * simple.el (eval-expression): Doc fix. 9 * simple.el (eval-expression): Doc fix.
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 1b79f0a595a..039ecefceec 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -113,7 +113,7 @@
113(eval-when-compile (require 'cl)) 113(eval-when-compile (require 'cl))
114(require 'pcvs-util) 114(require 'pcvs-util)
115(autoload 'vc-find-revision "vc") 115(autoload 'vc-find-revision "vc")
116(autoload 'vc-version-diff "vc") 116(autoload 'vc-diff-internal "vc")
117 117
118(defvar cvs-minor-wrap-function) 118(defvar cvs-minor-wrap-function)
119 119
@@ -496,11 +496,12 @@ changeset that affected the currently considered file(s)."
496 (goto-char end) 496 (goto-char end)
497 (log-view-msg-next) 497 (log-view-msg-next)
498 (setq to (log-view-current-tag)))) 498 (setq to (log-view-current-tag))))
499 (vc-version-diff 499 (vc-diff-internal
500 (if log-view-per-file-logs 500 t (list log-view-vc-backend
501 (list (log-view-current-file)) 501 (if log-view-per-file-logs
502 log-view-vc-fileset) 502 (list (log-view-current-file))
503 to fr))) 503 log-view-vc-fileset))
504 to fr)))
504 505
505(declare-function vc-diff-internal "vc" 506(declare-function vc-diff-internal "vc"
506 (async vc-fileset rev1 rev2 &optional verbose)) 507 (async vc-fileset rev1 rev2 &optional verbose))