2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a173f58335a..d030d24304e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 56bcde521ac..93a8a418806 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -546,7 +546,8 @@ If the prefix ARG is given, restrict the view to the current file instead."
   (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)