diff options
| author | Miles Bader <miles@gnu.org> | 2008-03-01 01:28:31 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-03-01 01:28:31 +0000 |
| commit | 51fb064bc72968e739e8dea580e58796c1a87f4c (patch) | |
| tree | 80c29b96dbb547a7c8db57a6d57ae4c6d2bfc1ca /lisp/diff-mode.el | |
| parent | 14e8de0c3f87a228c05902be66c5bcf953636611 (diff) | |
| parent | 613f60eeb171e5ad881f52d9e7c0ffce2e182fcb (diff) | |
| download | emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 8a3433537b0..afd9399d1e5 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1363,7 +1363,8 @@ Only works for unified diffs." (cond ((and diff-valid-unified-empty-line ;; Not just (eolp) so we don't infloop at eob. - (eq (char-after) ?\n)) + (eq (char-after) ?\n) + (> before 0) (> after 0)) (decf before) (decf after) t) ((and (zerop before) (zerop after)) nil) ((or (< before 0) (< after 0)) |