# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1170868116 0
# Node ID 75ea46f62d74ad0f08297004b710eb3fb72a0655
# Parent  90b2ab886158541360b94d9da1c83a13161aa69c
*** empty log message ***

diff -r 90b2ab886158 -r 75ea46f62d74 lisp/ChangeLog
--- 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
diff -r 90b2ab886158 -r 75ea46f62d74 lisp/diff-mode.el
--- 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))))