master 35d71606c24: vc-region-history: Respect vc-buffer-overriding-fileset
Sean Whitton <[email protected]>
| Newsgroups | gmane.emacs.diffs |
|---|---|
| Message-ID | <[email protected]> |
branch: master commit 35d71606c2459333b17983f030af124a1b18e811 Author: Sean Whitton <[email protected]> Commit: Sean Whitton <[email protected]> vc-region-history: Respect vc-buffer-overriding-fileset * lisp/vc/vc.el (vc-region-history): Respect vc-buffer-overriding-fileset. --- lisp/vc/vc.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 46715d01693..734cea24113 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -4779,8 +4779,9 @@ mark." (interactive "r") (let* ((lfrom (line-number-at-pos from t)) (lto (line-number-at-pos (1- to) t)) - (file buffer-file-name) - (backend (vc-backend file)) + (fileset (vc-deduce-fileset t)) + (backend (car fileset)) + (file (caadr fileset)) (buf (get-buffer-create "*VC-history*"))) (unless backend (error "Buffer is not version controlled")) @@ -4790,7 +4791,7 @@ mark." (with-current-buffer buf (vc-call-backend backend 'region-history-mode) (setq-local log-view-vc-backend backend) - (setq-local log-view-vc-fileset (list file)) + (setq-local log-view-vc-fileset (cadr fileset)) (setq-local revert-buffer-function (lambda (_ignore-auto _noconfirm) (with-current-buffer buf