diff options
| author | Dima Kogan <dima@secretsauce.net> | 2016-12-19 23:25:28 -0800 |
|---|---|---|
| committer | Dima Kogan <dima@secretsauce.net> | 2016-12-24 21:32:34 -0800 |
| commit | 6b6abe0dba6a9a2e5f78aac3814421886e7a184f (patch) | |
| tree | eaa93763b1b73be6600a8d025e67589c8d2abda5 /lisp/vc/diff-mode.el | |
| parent | 2dae636237603b436b48e77e2f893bb4d42f3ce7 (diff) | |
| download | emacs-6b6abe0dba6a9a2e5f78aac3814421886e7a184f.tar.gz | |
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.
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index d5ea002fa82..d74ff2f5c99 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 |