# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1240297011 0
# Node ID 5b883aa3f804c1b1ce301ee69331659cdd35f294
# Parent  0bb957371fc2b1d499b36f847d923a39aa2f310a
(diff-find-source-location): Don't call
diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)

diff -r 0bb957371fc2 -r 5b883aa3f804 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 21 06:46:39 2009 +0000
+++ b/lisp/ChangeLog	Tue Apr 21 06:56:51 2009 +0000
@@ -1,3 +1,8 @@
+2009-04-21  Martin Rudalics  <rudalics@gmx.at>
+
+	* diff-mode.el (diff-find-source-location): Don't call
+	diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)
+
 2009-04-21  Kenichi Handa  <handa@m17n.org>
 
 	* international/uni-decomposition.el: Re-generated.
diff -r 0bb957371fc2 -r 5b883aa3f804 lisp/diff-mode.el
--- a/lisp/diff-mode.el	Tue Apr 21 06:46:39 2009 +0000
+++ b/lisp/diff-mode.el	Tue Apr 21 06:56:51 2009 +0000
@@ -1575,7 +1575,9 @@
            ;; 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))
+	   ;;
+	   ;; Suppress check when NOPROMPT is non-nil (Bug#3030).
+           (_ (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))