[Emacs-diffs] master 6b6abe0 1/2: diff-mode is able to better handle file headers

[Dima Kogan]

branch: master
commit 6b6abe0dba6a9a2e5f78aac3814421886e7a184f
Author: Dima Kogan <address@hidden>
Commit: Dima Kogan <address@hidden>

    diff-mode is able to better handle file headers
    
    This fixes a regression introduced in
    
      
http://git.savannah.gnu.org/gitweb/?p=emacs.git;a=commit;h=2c8a7e50d24daf19ea7d86f1cfeaa98a41c56085
    
    This bug was filed in
    
      https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25105
    
    Patches generated from a VCS such as git contain a patch message at the
    start, and diff-mode is now once-again able to properly able to ignore
    this message when issuing navigation commands around the message.
    
    * lisp/vc/diff-mode.el (diff-beginning-of-file-and-junk): More
      thoroughly ignore the header when looking for a beginning of file
      diffs.
---
 lisp/vc/diff-mode.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index d5ea002..d74ff2f 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -768,7 +768,7 @@ data such as \"Index: ...\" and such."
         (setq prevfile nextfile))
     (if (and previndex (numberp prevfile) (< previndex prevfile))
         (setq prevfile previndex))
-    (if (and (numberp prevfile) (<= prevfile start))
+    (if (numberp prevfile)
           (progn
             (goto-char prevfile)
             ;; Now skip backward over the leading junk we may have before the