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

2365ab4a · Stefan Monnier · 7d506bfc · 2365ab4a · 2365ab4a
Commit 2365ab4a authored Feb 08, 2007 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/diff-mode.el lisp/diff-mode.el +1 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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.
--- 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