Mercurial > emacs
changeset 75727:612c9d0aab1d
(diff-sanity-check-hunk): Fix last fix.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 08 Feb 2007 16:34:28 +0000 |
| parents | 469be04fbaba |
| children | 7442836ceba2 |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Feb 08 12:39:30 2007 +0000 +++ b/lisp/ChangeLog Thu Feb 08 16:34:28 2007 +0000 @@ -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.
--- a/lisp/diff-mode.el Thu Feb 08 12:39:30 2007 +0000 +++ b/lisp/diff-mode.el Thu Feb 08 16:34:28 2007 +0000 @@ -1115,7 +1115,7 @@ ;; 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