[Emacs-diffs] trunk r117710: Handle missing space marker in unified diff during header fixup

[Andreas Schwab]

------------------------------------------------------------
revno: 117710
revision-id: address@hidden
parent: address@hidden
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2014-08-16 21:51:27 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/diff-mode.el           
diffmode.el-20091113204419-o5vbwnq5f7feedwu-1659

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-16 16:50:32 +0000
+++ b/lisp/ChangeLog    2014-08-16 19:51:27 +0000
@@ -1,3 +1,8 @@
+2014-08-16  Andreas Schwab  <address@hidden>
+
+       * vc/diff-mode.el (diff-fixup-modifs): Handle empty line in
+       context of unified diff.
+
 2014-08-16  Paul Eggert  <address@hidden>
 
        Add dependencies to fix loaddefs race during parallel builds.

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2014-06-18 08:48:49 +0000
+++ b/lisp/vc/diff-mode.el      2014-08-16 19:51:27 +0000
@@ -1220,6 +1220,9 @@
                (?- (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)