Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
This commit is contained in:
commit
51fb064bc7
15 changed files with 145 additions and 63 deletions
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue