Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10663
diff -c -F^(defun -r1.10663 ChangeLog
*** lisp/ChangeLog	8 Feb 2007 06:31:28 -0000	1.10663
--- lisp/ChangeLog	8 Feb 2007 09:39:42 -0000
***************
*** 1,3 ****
--- 1,9 ----
+ 2007-02-08  Per Cederqvist  <ceder@lysator.liu.se>  (tiny change)
+ 
+ 	* diff-mode.el (diff-sanity-check-hunk): My fix to this function
+ 	that was committed on 2007-02-07 was edited by the committer.  The
+ 	"improved" version fails for context diffs that use "-p".  Fix.
+ 
  2007-02-08  Karl Fogel  <kfogel@red-bean.com>
  
  	* emacs/lisp/simple.el (fundamental-mode-hook): Declare new hook.
Index: lisp/diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.95
diff -c -F^(defun -r1.95 diff-mode.el
*** lisp/diff-mode.el	7 Feb 2007 17:08:36 -0000	1.95
--- lisp/diff-mode.el	8 Feb 2007 09:39:42 -0000
*************** (defun diff-sanity-check-hunk ()
*** 1115,1121 ****
  
         ;; A context diff.
         ((eq (char-after) ?*)
!         (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
--- 1115,1121 ----
  
         ;; A context diff.
         ((eq (char-after) ?*)
!         (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