# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1170952468 0
# Node ID 612c9d0aab1d6c19a15f056a8fbde08200709ceb
# Parent  469be04fbaba5926862e0e9922afa8d81484d2c8
(diff-sanity-check-hunk): Fix last fix.

diff -r 469be04fbaba -r 612c9d0aab1d lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 08 12:39:30 2007 +0000
+++ b/lisp/ChangeLog	Thu Feb 08 16:34:28 2007 +0000
@@ -1,3 +1,7 @@
+2007-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* diff-mode.el (diff-sanity-check-hunk): Fix last fix.
+
 2007-02-08  Karl Fogel  <kfogel@red-bean.com>
 
 	* simple.el (fundamental-mode-hook): Declare new hook.
diff -r 469be04fbaba -r 612c9d0aab1d lisp/diff-mode.el
--- a/lisp/diff-mode.el	Thu Feb 08 12:39:30 2007 +0000
+++ b/lisp/diff-mode.el	Thu Feb 08 16:34:28 2007 +0000
@@ -1115,7 +1115,7 @@
 
        ;; A context diff.
        ((eq (char-after) ?*)
-        (if (not (looking-at "\\*\\{15\\}\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*"))
+        (if (not (looking-at "\\*\\{15\\}\\(?: .*\\)?\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*"))
             (error "Unrecognized context diff first hunk header format")
           (forward-line 2)
           (diff-sanity-check-context-hunk-half