diff options
| author | Martin Rudalics | 2009-04-21 07:19:01 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2009-04-21 07:19:01 +0000 |
| commit | 19a4c5043a12fc81530d10544715283f6073e402 (patch) | |
| tree | 062d1a9410920dc802abb84e98ff41886cd037dc | |
| parent | 5dadb083d4501d5aec3c92a90bab381353e7e91c (diff) | |
| download | emacs-19a4c5043a12fc81530d10544715283f6073e402.tar.gz emacs-19a4c5043a12fc81530d10544715283f6073e402.zip | |
Fix bug number in comment.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d34ff6a2465..614615f8143 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2009-04-21 Martin Rudalics <rudalics@gmx.at> | 1 | 2009-04-21 Martin Rudalics <rudalics@gmx.at> |
| 2 | 2 | ||
| 3 | * diff-mode.el (diff-find-source-location): Don't call | 3 | * diff-mode.el (diff-find-source-location): Don't call |
| 4 | diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3030) | 4 | diff-sanity-check-hunk when NOPROMPT is non-nil. (Bug#3033) |
| 5 | 5 | ||
| 6 | 2009-04-21 Kenichi Handa <handa@m17n.org> | 6 | 2009-04-21 Kenichi Handa <handa@m17n.org> |
| 7 | 7 | ||
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 6242cda13c4..624b0ccfb3e 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -1576,7 +1576,7 @@ NOPROMPT, if non-nil, means not to prompt the user." | |||
| 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 | ;; | 1578 | ;; |
| 1579 | ;; Suppress check when NOPROMPT is non-nil (Bug#3030). | 1579 | ;; Suppress check when NOPROMPT is non-nil (Bug#3033). |
| 1580 | (_ (unless noprompt (diff-sanity-check-hunk))) | 1580 | (_ (unless noprompt (diff-sanity-check-hunk))) |
| 1581 | (hunk (buffer-substring | 1581 | (hunk (buffer-substring |
| 1582 | (point) (save-excursion (diff-end-of-hunk) (point)))) | 1582 | (point) (save-excursion (diff-end-of-hunk) (point)))) |