From f2f1e307fe9ebde07666b0d6429877c8e8347fdc Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 1 Jul 2012 22:55:48 +0400 Subject: [PATCH] Use 0 lines of context when diffing for revert --- diff-hl.el | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/diff-hl.el b/diff-hl.el index 66118ca50..01d4ddb9f 100644 --- a/diff-hl.el +++ b/diff-hl.el @@ -98,17 +98,21 @@ (puthash key val diff-hl-spec-cache))) val)) -(defun diff-hl-changes () - (let* ((buf-name " *vc-diff-hl* ") - (vc-git-diff-switches nil) +(defmacro diff-hl-with-diff-switches (body) + `(let ((vc-git-diff-switches nil) (vc-hg-diff-switches nil) (vc-diff-switches '("-U0")) - (vc-disable-async-diff t) + (vc-disable-async-diff t)) + ,body)) + +(defun diff-hl-changes () + (let* ((buf-name " *diff-hl* ") (file (buffer-file-name)) (backend (vc-backend file)) res) (when backend - (vc-call-backend backend 'diff (list file) nil nil buf-name) + (diff-hl-with-diff-switches + (vc-call-backend backend 'diff (list file) nil nil buf-name)) (with-current-buffer buf-name (goto-char (point-min)) (unless (eobp) @@ -227,7 +231,8 @@ (fileset (vc-deduce-fileset))) (unwind-protect (progn - (vc-diff-internal nil fileset nil nil nil diff-buffer) + (diff-hl-with-diff-switches + (vc-diff-internal nil fileset nil nil nil diff-buffer)) (vc-exec-after `(progn (when (eobp) -- 2.39.2