From 4f155125f1b175821e3cf1f728243935f0830aa4 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 17 May 2008 17:07:46 +0000 Subject: [PATCH] (vc-annotate-show-diff-revision-at-line): Change vc-diff-internal arg to match what vc-deduce-fileseset returns now. --- lisp/ChangeLog | 5 +++++ lisp/vc.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0925cb462a..26f4a1df0d7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-05-17 Dan Nicolaescu + + * vc.el (vc-annotate-show-diff-revision-at-line): Change + vc-diff-internal arg to match what vc-deduce-fileseset returns now. + 2008-05-17 Vinicius Jose Latorre * menu-bar.el (menu-bar-select-buffer): Reinsert it as msb.el use it. diff --git a/lisp/vc.el b/lisp/vc.el index 73f0f8a013a..c973cf7057d 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1788,7 +1788,7 @@ See Info node `Merging'." ;; VC status implementation (defun vc-default-status-extra-headers (backend dir) - ;; Be loud by default to remind people to add coded to display + ;; Be loud by default to remind people to add code to display ;; backend specific headers. ;; XXX: change this to return nil before the release. "Extra : Add backend specific headers here") @@ -3103,7 +3103,10 @@ revisions after." (save-window-excursion (vc-diff-internal nil - (cons vc-annotate-backend (list vc-annotate-parent-file)) + ;; The value passed here should follow what + ;; `vc-deduce-fileset' returns. + (cons vc-annotate-backend + (cons (list vc-annotate-parent-file) nil)) prev-rev rev-at-line)) (switch-to-buffer "*vc-diff*")))))) -- 2.39.2