# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1252507674 0
# Node ID 511c7f2425a4af2598e929a1c35656d484e2467e
# Parent  e86ba08d7eac58a5e880674d52bd458143cc239b
(diff-hunk-kill): Fix the search of the next hunk (bug#4368).

diff -r e86ba08d7eac -r 511c7f2425a4 lisp/ChangeLog
--- 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):
diff -r e86ba08d7eac -r 511c7f2425a4 lisp/diff-mode.el
--- 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)