diff options
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |