[Emacs-diffs] emacs/lisp ChangeLog diff-mode.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/09 14:47:59

Modified files:
        lisp           : ChangeLog diff-mode.el 

Log message:
        (diff-hunk-kill): Fix the search of the next hunk (bug#4368).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16115&r2=1.16116
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/diff-mode.el?cvsroot=emacs&r1=1.161&r2=1.162

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16115
retrieving revision 1.16116
diff -u -b -r1.16115 -r1.16116
--- ChangeLog   9 Sep 2009 09:29:29 -0000       1.16115
+++ ChangeLog   9 Sep 2009 14:47:54 -0000       1.16116
@@ -1,3 +1,8 @@
+2009-09-09  Stefan Monnier  <address@hidden>
+
+       * diff-mode.el (diff-hunk-kill): Fix the search of the next hunk
+       (bug#4368).
+
 2009-09-09  Katsumi Yamaoka  <address@hidden>
 
        * calendar/time-date.el (autoload):

Index: diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- diff-mode.el        1 Sep 2009 07:24:18 -0000       1.161
+++ diff-mode.el        9 Sep 2009 14:47:59 -0000       1.162
@@ -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)