Commit 52e7a5b9 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

Handle missing space marker in unified diff during header fixup

* vc/diff-mode.el (diff-fixup-modifs): Handle empty line in
context of unified diff.
parent 3bcff29c
2014-08-16 Andreas Schwab <schwab@linux-m68k.org>
* vc/diff-mode.el (diff-fixup-modifs): Handle empty line in
context of unified diff.
2014-08-16 Paul Eggert <eggert@cs.ucla.edu>
 
Add dependencies to fix loaddefs race during parallel builds.
......
......@@ -1220,6 +1220,9 @@ else cover the whole buffer."
(?- (cl-incf minus))
(?! (cl-incf bang))
((or ?\\ ?#) nil)
(?\n (if diff-valid-unified-empty-line
(cl-incf space)
(setq space 0 plus 0 minus 0 bang 0)))
(_ (setq space 0 plus 0 minus 0 bang 0)))
(cond
((looking-at diff-hunk-header-re-unified)
......
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