diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
| commit | 2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch) | |
| tree | 4837c369ac576fbfd063b1ff046a3daca372f082 /lisp/vc/vc.el | |
| parent | c971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff) | |
| parent | 7c33a0572280bdcf0583c5625cfda32f63fad56d (diff) | |
| download | emacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/vc/vc.el')
| -rw-r--r-- | lisp/vc/vc.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 23dd6f0f7ae..434c2a10e14 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1700,8 +1700,9 @@ If `F.~REV~' already exists, use it instead of checking it out again." rev))) (switch-to-buffer-other-window (vc-find-revision file revision)))) -(defun vc-find-revision (file revision) - "Read REVISION of FILE into a buffer and return the buffer." +(defun vc-find-revision (file revision &optional backend) + "Read REVISION of FILE into a buffer and return the buffer. +Use BACKEND as the VC backend if specified." (let ((automatic-backup (vc-version-backup-file-name file revision)) (filebuf (or (get-file-buffer file) (current-buffer))) (filename (vc-version-backup-file-name file revision 'manual))) @@ -1719,7 +1720,9 @@ If `F.~REV~' already exists, use it instead of checking it out again." ;; Change buffer to get local value of ;; vc-checkout-switches. (with-current-buffer filebuf - (vc-call find-revision file revision outbuf)))) + (if backend + (vc-call-backend backend 'find-revision file revision outbuf) + (vc-call find-revision file revision outbuf))))) (setq failed nil)) (when (and failed (file-exists-p filename)) (delete-file filename)))) |