(diff-sanity-check-hunk): Fix last fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 000d369c624f6c546449d4f19ffddfa072e68a09..f80c413558f93403e1ff2c431c0c7e1d943c23af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 8d61e0ba0fc85cf92f85060bd79f5599ab2429c6..c4fac402dbfebf3e3e4733d9fbf8e0ab80e7a66b 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1115,7 +1115,7 @@ Only works for unified diffs."
 
        ;; 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