# HG changeset patch # User Glenn Morris # Date 1200368804 0 # Node ID 8ac943071f87a8f61eb23c80d7c6daebccf44831 # Parent b42de16944ab67cb1000b95cf075fd55dabab00b (diff-end-of-hunk): Revert 2008-01-08 change. diff -r b42de16944ab -r 8ac943071f87 lisp/diff-mode.el --- a/lisp/diff-mode.el Tue Jan 15 03:45:18 2008 +0000 +++ b/lisp/diff-mode.el Tue Jan 15 03:46:44 2008 +0000 @@ -391,13 +391,9 @@ ;; 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 "^[^-+# \\\n]\\|" + (unified (concat "^[^-+# \\]\\|" diff-file-header-re)) (context "^[^-+#! \\]") (normal "^[^<>#\\]")