mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

(diff-find-source-location): Don't call

Browse Source 
diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)
This commit is contained in:
Martin Rudalics 2009-04-21 06:56:51 +00:00
parent 908567efed
commit 5dadb083d4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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> 2009-04-21 Kenichi Handa <handa@m17n.org>
* international/uni-decomposition.el: Re-generated. * international/uni-decomposition.el: Re-generated.

4
lisp/diff-mode.el
View File

@ -1575,7 +1575,9 @@ NOPROMPT, if non-nil, means not to prompt the user."
;; the user may disagree on what constitutes the hunk ;; the user may disagree on what constitutes the hunk
;; (e.g. because an empty line truncates the hunk mid-course), ;; (e.g. because an empty line truncates the hunk mid-course),
;; leading to potentially nasty surprises for the user. ;; 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 (hunk (buffer-substring
(point) (save-excursion (diff-end-of-hunk) (point)))) (point) (save-excursion (diff-end-of-hunk) (point))))
(old (diff-hunk-text hunk reverse char-offset)) (old (diff-hunk-text hunk reverse char-offset))