Commit 79fd6168 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(diff-sanity-check-hunk): Only accept an empty line if

we still expect more lines.
parent fbd882ed
2008-02-29 Stefan Monnier <monnier@iro.umontreal.ca>
* diff-mode.el (diff-sanity-check-hunk): Only accept an empty line if
we still expect more lines.
2008-02-28 Juri Linkov <juri@jurta.org> 2008-02-28 Juri Linkov <juri@jurta.org>
   
* startup.el (normal-splash-screen): Add argument `concise'. * startup.el (normal-splash-screen): Add argument `concise'.
...@@ -1251,7 +1251,8 @@ Only works for unified diffs." ...@@ -1251,7 +1251,8 @@ Only works for unified diffs."
(cond (cond
((and diff-valid-unified-empty-line ((and diff-valid-unified-empty-line
;; Not just (eolp) so we don't infloop at eob. ;; 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) (decf before) (decf after) t)
((and (zerop before) (zerop after)) nil) ((and (zerop before) (zerop after)) nil)
((or (< before 0) (< after 0)) ((or (< before 0) (< after 0))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment