From 2365ab4a00ee91a085d5379c2491f319a6a082ba Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 8 Feb 2007 16:34:28 +0000 Subject: [PATCH] (diff-sanity-check-hunk): Fix last fix. --- lisp/ChangeLog | 4 ++++ lisp/diff-mode.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * diff-mode.el (diff-sanity-check-hunk): Fix last fix. + 2007-02-08 Karl Fogel * 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 -- 2.39.2