*** diff-mode.el.~1.157.~	2009-01-13 15:55:57.000000000 +0100
--- diff-mode.el	2009-04-20 09:39:22.515625000 +0200
***************
*** 1575,1581 ****
             ;; the user may disagree on what constitutes the hunk
             ;; (e.g. because an empty line truncates the hunk mid-course),
             ;; leading to potentially nasty surprises for the user.
!            (_ (diff-sanity-check-hunk))
  	   (hunk (buffer-substring
                    (point) (save-excursion (diff-end-of-hunk) (point))))
  	   (old (diff-hunk-text hunk reverse char-offset))
--- 1575,1581 ----
             ;; the user may disagree on what constitutes the hunk
             ;; (e.g. because an empty line truncates the hunk mid-course),
             ;; leading to potentially nasty surprises for the user.
!            (_ (unless noprompt (diff-sanity-check-hunk)))
  	   (hunk (buffer-substring
                    (point) (save-excursion (diff-end-of-hunk) (point))))
  	   (old (diff-hunk-text hunk reverse char-offset))