From a283d655db88cdcc8cb53d8e2578e1cdf751c84b Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Tue, 29 Nov 2016 18:56:08 -0500 Subject: [PATCH] Fix previous commit * lisp/vc/diff-mode.el (diff-refine-hunk): Make sure to go to beginning of hunk before calling `diff-hunk-style'. --- lisp/vc/diff-mode.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 6ddadb3c239..5b48c8d93df 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -2065,14 +2065,13 @@ For use in `add-log-current-defun-function'." (require 'smerge-mode) (save-excursion (let* ((hunk-bounds (diff-bounds-of-hunk)) - (style (diff-hunk-style)) ;Skips the hunk header as well. + (style (progn (goto-char (car hunk-bounds)) + (diff-hunk-style))) ;Skips the hunk header as well. (beg (point)) + (end (cadr hunk-bounds)) (props-c '((diff-mode . fine) (face diff-refine-changed))) (props-r '((diff-mode . fine) (face diff-refine-removed))) - (props-a '((diff-mode . fine) (face diff-refine-added))) - ;; Be careful to go back to `start' so diff-end-of-hunk gets - ;; to read the hunk header's line info. - (end (goto-char (cadr hunk-bounds)))) + (props-a '((diff-mode . fine) (face diff-refine-added)))) (remove-overlays beg end 'diff-mode 'fine) -- 2.39.2