From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 8 Feb 2007 16:34:28 +0000 (+0000)
Subject: (diff-sanity-check-hunk): Fix last fix.
X-Git-Tag: emacs-pretest-22.0.94~343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2365ab4a00ee91a085d5379c2491f319a6a082ba;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 000d369c624..f80c413558f 100644
--- 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 8d61e0ba0fc..c4fac402dbf 100644
--- 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