diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2009-04-21 06:56:51 +0000 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2009-04-21 06:56:51 +0000 |
| commit | 5dadb083d4501d5aec3c92a90bab381353e7e91c (patch) | |
| tree | 4e77798547b672d169fabcdc2bef3706322ce861 /lisp | |
| parent | 908567efed9996f9f7a47124875195c194ad1ab6 (diff) | |
| download | emacs-5dadb083d4501d5aec3c92a90bab381353e7e91c.tar.gz | |
(diff-find-source-location): Don't call
diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3030)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 4 |
2 files changed, 8 insertions, 1 deletions
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 <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 --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)) |