Mercurial > emacs
changeset 95060:e1e4085b4297
(vc-annotate-show-diff-revision-at-line): Change
vc-diff-internal arg to match what vc-deduce-fileseset returns now.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 17 May 2008 17:07:46 +0000 |
| parents | 4ce13b37e978 |
| children | d34603ec651d |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat May 17 14:33:48 2008 +0000 +++ b/lisp/ChangeLog Sat May 17 17:07:46 2008 +0000 @@ -1,3 +1,8 @@ +2008-05-17 Dan Nicolaescu <dann@rosas> + + * 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 <viniciusjl@ig.com.br> * menu-bar.el (menu-bar-select-buffer): Reinsert it as msb.el use it.
--- a/lisp/vc.el Sat May 17 14:33:48 2008 +0000 +++ b/lisp/vc.el Sat May 17 17:07:46 2008 +0000 @@ -1788,7 +1788,7 @@ ;; 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 @@ (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*"))))))