(diff-end-of-hunk): Don't match empty lines in unified format.

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 4c566b344a993f91e4d427588b02fc4a327feb46..a088cd6ccbaa7c1423ad5458c1e15445097c5258 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -391,9 +391,13 @@ when editing big diffs)."
       ;; Especially important for unified (because headers are ambiguous).
       (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
     (goto-char (match-end 0)))
+  ;; Some versions of diff replace all-blank context lines in unified
+  ;; format with empty lines. The use of \n below avoids matching such
+  ;; lines as headers.
+  ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html
   (let ((end (and (re-search-forward (case style
                                       ;; A `unified' header is ambiguous.
-                                      (unified (concat "^[^-+# \\]\\|"
+                                      (unified (concat "^[^-+# \\\n]\\|"
                                                        diff-file-header-re))
                                       (context "^[^-+#! \\]")
                                       (normal "^[^<>#\\]")