# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1204252810 0
# Node ID 3629f9a94638223e67d3732e67da3534cab64213
# Parent  ad818454aedc265adee3e0b88fc9e8c5b0c3e96d
(diff-sanity-check-hunk): Only accept an empty line if
we still expect more lines.

diff -r ad818454aedc -r 3629f9a94638 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 29 02:02:39 2008 +0000
+++ b/lisp/ChangeLog	Fri Feb 29 02:40:10 2008 +0000
@@ -1,3 +1,8 @@
+2008-02-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* diff-mode.el (diff-sanity-check-hunk): Only accept an empty line if
+	we still expect more lines.
+
 2008-02-28  Juri Linkov  <juri@jurta.org>
 
 	* startup.el (normal-splash-screen): Add argument `concise'.
diff -r ad818454aedc -r 3629f9a94638 lisp/diff-mode.el
--- a/lisp/diff-mode.el	Fri Feb 29 02:02:39 2008 +0000
+++ b/lisp/diff-mode.el	Fri Feb 29 02:40:10 2008 +0000
@@ -1251,7 +1251,8 @@
                    (cond
                     ((and diff-valid-unified-empty-line
                           ;; Not just (eolp) so we don't infloop at eob.
-                          (eq (char-after) ?\n))
+                          (eq (char-after) ?\n)
+                          (> before 0) (> after 0))
                      (decf before) (decf after) t)
                     ((and (zerop before) (zerop after)) nil)
                     ((or (< before 0) (< after 0))