# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1202661367 0
# Node ID f68e2df975f5046d03d79967bc9fde2f3c22d4ff
# Parent  c2981640cb2c97310a78579c957e665df2c13bda
(diff-beginning-of-file-and-junk): If we're on the
Index: line, don't search backward for the previous one.

diff -r c2981640cb2c -r f68e2df975f5 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 10 14:04:01 2008 +0000
+++ b/lisp/ChangeLog	Sun Feb 10 16:36:07 2008 +0000
@@ -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  ,AF(Bvar Arnfj,Av(Br,Ap(B Bjarmason  <avar@cpan.org>  (tiny change)
 
 	* net/rcirc.el (rcirc-url-regexp): Replace definition by copying
diff -r c2981640cb2c -r f68e2df975f5 lisp/diff-mode.el
--- a/lisp/diff-mode.el	Sun Feb 10 14:04:01 2008 +0000
+++ b/lisp/diff-mode.el	Sun Feb 10 16:36:07 2008 +0000
@@ -489,6 +489,7 @@
       (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)