* diff-mode.el (diff-refine-hunk): Make it work when the hunk contains

empty lines without a leading space.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e16bcdaabccf8cea33958977cb0de8b2c77b2e5e..94f0bc962779c854c46a4820aef973bde32465c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * diff-mode.el (diff-refine-hunk): Make it work when the hunk contains
+       empty lines without a leading space.
+
 2010-12-06  Leo <sdl.web@gmail.com>
 
        * dired-aux.el (dired-do-redisplay): Postphone

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 907bf7d5b83bfe5430148206d91aeeae07f2362b..017d1b21b5adc15b97e0b37704ece9cfceff24ea 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1827,10 +1827,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)