mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-23

Browse source
This commit is contained in:
Stefan Monnier 2010-12-13 10:27:36 -05:00
commit f49d1f52b2
51 changed files with 1551 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/vc/diff-mode.el
View file

@ -1829,10 +1829,13 @@ For use in `add-log-current-defun-function'."
(eval-and-compile (require 'smerge-mode))
(save-excursion
(diff-beginning-of-hunk 'try-harder)
(let* ((style (diff-hunk-style)) ;Skips the hunk header as well.
(let* ((start (point))
(style (diff-hunk-style)) ;Skips the hunk header as well.
(beg (point))
(props '((diff-mode . fine) (face diff-refine-change)))
(end (progn (diff-end-of-hunk) (point))))
;; Be careful to go back to `start' so diff-end-of-hunk gets
;; to read the hunk header's line info.
(end (progn (goto-char start) (diff-end-of-hunk) (point))))
(remove-overlays beg end 'diff-mode 'fine)