procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle missing space marker in unified diff during header fixup

Browse source 
* vc/diff-mode.el (diff-fixup-modifs): Handle empty line in
context of unified diff.
This commit is contained in:
Andreas Schwab 2014-08-16 21:51:27 +02:00
parent 3bcff29cea
commit 52e7a5b99f
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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.

3
lisp/vc/diff-mode.el
View file

@ -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)