diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-10 16:36:07 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-10 16:36:07 +0000 |
| commit | d0564e7a2725fb378ca371e841c748a3dc95e0f5 (patch) | |
| tree | 343efcb03f35aef864fa5158a609ddb11494d771 /lisp | |
| parent | 0f9357061a45b0e019e46e6b2fac1fbd11e84535 (diff) | |
| download | emacs-d0564e7a2725fb378ca371e841c748a3dc95e0f5.tar.gz | |
(diff-beginning-of-file-and-junk): If we're on the
Index: line, don't search backward for the previous one.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 10f4ed05361..449805bca53 100644 --- 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 ,AF(Bvar Arnfj,Av(Br,Ap(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 4c566b344a9..6794fab11f8 100644 --- 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) |