Mercurial > emacs
diff lisp/vc/vc.el @ 109431:799b50142743
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 11 Jul 2010 22:57:47 +0000 |
| parents | c166807ffc89 60516122d066 |
| children | d92d0e17a7ce |
line wrap: on
line diff
--- a/lisp/vc/vc.el Fri Jul 09 01:50:09 2010 +0000 +++ b/lisp/vc/vc.el Sun Jul 11 22:57:47 2010 +0000 @@ -1700,8 +1700,9 @@ 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 @@ ;; 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))))