diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-02-08 16:34:28 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-02-08 16:34:28 +0000 |
| commit | 2365ab4a00ee91a085d5379c2491f319a6a082ba (patch) | |
| tree | c4746f6b808c6e33e35007772376790b28973ea0 /lisp/diff-mode.el | |
| parent | 7d506bfcf7d644b422a5e5145795f60acf2fc644 (diff) | |
| download | emacs-2365ab4a00ee91a085d5379c2491f319a6a082ba.tar.gz emacs-2365ab4a00ee91a085d5379c2491f319a6a082ba.tar.bz2 emacs-2365ab4a00ee91a085d5379c2491f319a6a082ba.zip | |
(diff-sanity-check-hunk): Fix last fix.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 |