From 5dadb083d4501d5aec3c92a90bab381353e7e91c Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 21 Apr 2009 06:56:51 +0000 Subject: [PATCH] (diff-find-source-location): Don't call diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3030) --- lisp/ChangeLog | 5 +++++ lisp/diff-mode.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8130b30fa6f..d34ff6a2465 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-04-21 Martin Rudalics + + * 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 * international/uni-decomposition.el: Re-generated. diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index a83200d8982..6242cda13c4 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1575,7 +1575,9 @@ NOPROMPT, if non-nil, means not to prompt the user." ;; 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)) -- 2.11.4.GIT