From b07ca177d449e58e6e5c14e21e140e63354e335c Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 31 Jul 2015 05:52:53 +0300 Subject: [PATCH] Fix default-directory in changeset diffs after vc-print-log * lisp/vc/log-view.el (log-view-diff-common): Move the revision-granularity check back into log-view-diff-changeset. (log-view-diff-changeset): Bind default-directory to the current VC root. --- lisp/vc/log-view.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index 19bbc45f927..f1b57109e33 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el @@ -607,13 +607,12 @@ considered file(s)." (interactive (list (if (use-region-p) (region-beginning) (point)) (if (use-region-p) (region-end) (point)))) - (log-view-diff-common beg end t)) + (when (eq (vc-call-backend log-view-vc-backend 'revision-granularity) 'file) + (error "The %s backend does not support changeset diffs" log-view-vc-backend)) + (let ((default-directory (vc-root-dir))) + (log-view-diff-common beg end t))) (defun log-view-diff-common (beg end &optional whole-changeset) - (when (and whole-changeset - (eq (vc-call-backend log-view-vc-backend 'revision-granularity) - 'file)) - (error "The %s backend does not support changeset diffs" log-view-vc-backend)) (let ((to (log-view-current-tag beg)) (fr (log-view-current-tag end))) (when (string-equal fr to) -- 2.39.5