diff options
| author | Martin Rudalics | 2009-04-21 06:56:51 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2009-04-21 06:56:51 +0000 |
| commit | 5dadb083d4501d5aec3c92a90bab381353e7e91c (patch) | |
| tree | 4e77798547b672d169fabcdc2bef3706322ce861 /lisp/diff-mode.el | |
| parent | 908567efed9996f9f7a47124875195c194ad1ab6 (diff) | |
| download | emacs-5dadb083d4501d5aec3c92a90bab381353e7e91c.tar.gz emacs-5dadb083d4501d5aec3c92a90bab381353e7e91c.zip | |
(diff-find-source-location): Don't call
diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3030)
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." | |||
| 1575 | ;; the user may disagree on what constitutes the hunk | 1575 | ;; the user may disagree on what constitutes the hunk |
| 1576 | ;; (e.g. because an empty line truncates the hunk mid-course), | 1576 | ;; (e.g. because an empty line truncates the hunk mid-course), |
| 1577 | ;; leading to potentially nasty surprises for the user. | 1577 | ;; leading to potentially nasty surprises for the user. |
| 1578 | (_ (diff-sanity-check-hunk)) | 1578 | ;; |
| 1579 | ;; Suppress check when NOPROMPT is non-nil (Bug#3030). | ||
| 1580 | (_ (unless noprompt (diff-sanity-check-hunk))) | ||
| 1579 | (hunk (buffer-substring | 1581 | (hunk (buffer-substring |
| 1580 | (point) (save-excursion (diff-end-of-hunk) (point)))) | 1582 | (point) (save-excursion (diff-end-of-hunk) (point)))) |
| 1581 | (old (diff-hunk-text hunk reverse char-offset)) | 1583 | (old (diff-hunk-text hunk reverse char-offset)) |