(diff-beginning-of-file-and-junk): If we're on the

Index: line, don't search backward for the previous one.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bc3a32df6f0f03b85a8bae8daf16b4c2d238fb1..900489317a7a2213da4ed9cf8276d54e3e5b26e5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * diff-mode.el (diff-beginning-of-file-and-junk): If we're on the
+       Index: line, don't search backward for the previous one.
+
 2008-02-10  \e,AF\e(Bvar Arnfj\e,Av\e(Br\e,Ap\e(B Bjarmason  <avar@cpan.org>  (tiny change)
 
        * net/rcirc.el (rcirc-url-regexp): Replace definition by copying

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 4c566b344a993f91e4d427588b02fc4a327feb46..6794fab11f820e6b30f414d520ab8a8427571ff1 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -489,6 +489,7 @@ data such as \"Index: ...\" and such."
       (diff-file-next)
       (setq file (point)))
     (let ((index (save-excursion
+                   (forward-line 1)  ;In case we're looking at "Index:".
                    (re-search-backward "^Index: " prevhunk t))))
       (when index (setq file index))
       (if (<= file start)