From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 7 Feb 2007 17:08:36 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.94~359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3ee90d98c9ea11877df683a39d394af97e7dfae;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd6a28527e8..733d8496022 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index edf7317f2b4..8d61e0ba0fc 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
@@ -1131,7 +1131,7 @@ Only works for unified diffs."
        ;; 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))))