diff options
| author | Andreas Schwab | 2014-08-16 21:51:27 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2014-08-16 21:51:27 +0200 |
| commit | 52e7a5b99f790dcc21cf84ba0ae6537ccee11efc (patch) | |
| tree | 1f26ec5de9d059855db4f174e5cc987a17c3eaae /lisp/vc/diff-mode.el | |
| parent | 3bcff29cea902c92c2ddb20f992d2744fb404d12 (diff) | |
| download | emacs-52e7a5b99f790dcc21cf84ba0ae6537ccee11efc.tar.gz emacs-52e7a5b99f790dcc21cf84ba0ae6537ccee11efc.zip | |
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.
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 4908c5f4961..d4e973956c8 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -1220,6 +1220,9 @@ else cover the whole buffer." | |||
| 1220 | (?- (cl-incf minus)) | 1220 | (?- (cl-incf minus)) |
| 1221 | (?! (cl-incf bang)) | 1221 | (?! (cl-incf bang)) |
| 1222 | ((or ?\\ ?#) nil) | 1222 | ((or ?\\ ?#) nil) |
| 1223 | (?\n (if diff-valid-unified-empty-line | ||
| 1224 | (cl-incf space) | ||
| 1225 | (setq space 0 plus 0 minus 0 bang 0))) | ||
| 1223 | (_ (setq space 0 plus 0 minus 0 bang 0))) | 1226 | (_ (setq space 0 plus 0 minus 0 bang 0))) |
| 1224 | (cond | 1227 | (cond |
| 1225 | ((looking-at diff-hunk-header-re-unified) | 1228 | ((looking-at diff-hunk-header-re-unified) |