martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previous commit

Browse Source 
* lisp/vc/diff-mode.el (diff-refine-hunk): Make sure to go to beginning
of hunk before calling `diff-hunk-style'.
This commit is contained in:
Noam Postavsky
2016-11-29 18:56:08 -05:00
parent 61c6a10e31
commit a283d655db
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/vc/diff-mode.el
View File

@@ -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)