branch: externals/diff-hl
commit 4548d29eab3073becf538f76d8d4b59c5b120558
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
diff-hl-show-hunk: Use "vc diff" when we can
Resolves #258
---
diff-hl-show-hunk.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/diff-hl-show-hunk.el b/diff-hl-show-hunk.el
index 578ffa75a0..5a722f54b5 100644
--- a/diff-hl-show-hunk.el
+++ b/diff-hl-show-hunk.el
@@ -136,7 +136,10 @@ buffer."
(line (line-number-at-pos))
(dest-buffer diff-hl-show-hunk-diff-buffer-name))
(with-current-buffer buffer
- (diff-hl-diff-buffer-with-reference (buffer-file-name buffer)
dest-buffer)
+ (if (buffer-modified-p)
+ (diff-hl-diff-buffer-with-reference buffer-file-name dest-buffer)
+ (diff-hl-changes-buffer buffer-file-name (vc-backend buffer-file-name)
+ nil dest-buffer))
(switch-to-buffer dest-buffer)
(diff-hl-diff-skip-to line)
(setq vc-sentinel-movepoint (point)))
