Mercurial > emacs
changeset 104893:511c7f2425a4
(diff-hunk-kill): Fix the search of the next hunk (bug#4368).
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 09 Sep 2009 14:47:54 +0000 |
| parents | e86ba08d7eac |
| children | 7f459491fb93 |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 09 10:41:50 2009 +0000 +++ b/lisp/ChangeLog Wed Sep 09 14:47:54 2009 +0000 @@ -1,3 +1,8 @@ +2009-09-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * diff-mode.el (diff-hunk-kill): Fix the search of the next hunk + (bug#4368). + 2009-09-09 Katsumi Yamaoka <yamaoka@jpl.org> * calendar/time-date.el (autoload):
--- a/lisp/diff-mode.el Wed Sep 09 10:41:50 2009 +0000 +++ b/lisp/diff-mode.el Wed Sep 09 14:47:54 2009 +0000 @@ -546,7 +546,8 @@ (interactive) (diff-beginning-of-hunk) (let* ((start (point)) - (nexthunk (when (re-search-forward diff-hunk-header-re nil t) + ;; Search the second match, since we're looking at the first. + (nexthunk (when (re-search-forward diff-hunk-header-re nil t 2) (match-beginning 0))) (firsthunk (ignore-errors (goto-char start)