diff options
| author | Dan Nicolaescu | 2008-05-12 16:22:42 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-12 16:22:42 +0000 |
| commit | b257def74f82f6ec650636014ecd2acba76aaf3c (patch) | |
| tree | 5b2a7a2528f9b8bd6df1d385323a3cdc99c9a8fc | |
| parent | e64a3841c4188f2823ad66abf59173ae2c4095ce (diff) | |
| download | emacs-b257def74f82f6ec650636014ecd2acba76aaf3c.tar.gz emacs-b257def74f82f6ec650636014ecd2acba76aaf3c.zip | |
(vc-annotate-show-diff-revision-at-line): Remove incorrect
cons. Use vc-annotate-backend.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc.el | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3b4aa51bc3d..ae63e0b4065 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-05-12 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc.el (vc-annotate-show-diff-revision-at-line): Remove incorrect | ||
| 4 | cons. Use vc-annotate-backend. | ||
| 5 | |||
| 1 | 2008-05-12 Teodor Zlatanov <tzz@lifelogs.com> | 6 | 2008-05-12 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 7 | ||
| 3 | * mail/smtpmail.el: Add autoload for | 8 | * mail/smtpmail.el: Add autoload for |
diff --git a/lisp/vc.el b/lisp/vc.el index 54a4f2d25ca..68f0aa2c464 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -3147,9 +3147,7 @@ revisions after." | |||
| 3147 | (save-window-excursion | 3147 | (save-window-excursion |
| 3148 | (vc-diff-internal | 3148 | (vc-diff-internal |
| 3149 | nil | 3149 | nil |
| 3150 | (cons (vc-backend vc-annotate-parent-file) | 3150 | (cons vc-annotate-backend (list vc-annotate-parent-file)) |
| 3151 | (cons nil | ||
| 3152 | (list vc-annotate-parent-file))) | ||
| 3153 | prev-rev rev-at-line)) | 3151 | prev-rev rev-at-line)) |
| 3154 | (switch-to-buffer "*vc-diff*")))))) | 3152 | (switch-to-buffer "*vc-diff*")))))) |
| 3155 | 3153 | ||