Mercurial > emacs
changeset 75709:75ea46f62d74
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 07 Feb 2007 17:08:36 +0000 |
| parents | 90b2ab886158 |
| children | 0de586e9024e |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 07 16:21:20 2007 +0000 +++ b/lisp/ChangeLog Wed Feb 07 17:08:36 2007 +0000 @@ -1,3 +1,8 @@ +2007-02-07 Per Cederqvist <ceder@lysator.liu.se> (tiny change) + + * diff-mode.el (diff-sanity-check-hunk): Don't reject the hunk + just because the diff was produced using "-p" (--show-c-function). + 2007-02-07 Juanma Barranquero <lekktu@gmail.com> * faces.el (frame-set-background-mode): Use `color-values' and
--- a/lisp/diff-mode.el Wed Feb 07 16:21:20 2007 +0000 +++ b/lisp/diff-mode.el Wed Feb 07 17:08:36 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 @@ -1131,7 +1131,7 @@ ;; A unified diff. ((eq (char-after) ?@) (if (not (looking-at - "@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@$")) + "@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@")) (error "Unrecognized unified diff hunk header format") (let ((before (string-to-number (match-string 1))) (after (string-to-number (match-string 2))))