diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-14 00:23:30 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-14 00:23:30 +1200 |
| commit | be87b74b55a5b4b0cb397a0312f3c7fa755a79af (patch) | |
| tree | 27d9e8d8044d5329fed6fd607516b5662005a07b | |
| parent | Merge branch 'release/v1.0.0' into develop (diff) | |
| download | vim-diff-prune-be87b74b55a5b4b0cb397a0312f3c7fa755a79af.tar.gz vim-diff-prune-be87b74b55a5b4b0cb397a0312f3c7fa755a79af.zip | |
Don't require blocks to have a parent file
Per a bug report from Maksim Odnoletkov; this seems to make the mappings
work for the diffs generated with `git add --patch`.
| -rw-r--r-- | autoload/diff/prune.vim | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/autoload/diff/prune.vim b/autoload/diff/prune.vim index cfbce97..a562d71 100644 --- a/autoload/diff/prune.vim +++ b/autoload/diff/prune.vim @@ -16,6 +16,8 @@ function! diff#prune#Prune(type) abort " Now we need to look for any blocks or files to remove if they have no " changes in them anymore + let l:file_changes = 0 + let l:block_changes = 0 let l:deletions = {} for l:li in range(1, line('$') + 1) @@ -34,7 +36,6 @@ function! diff#prune#Prune(type) abort let l:block = stridx(l:line, '@@') == 0 && !l:eof let l:change = (stridx(l:line, '+') == 0 || stridx(l:line, '-') == 0) \ && !l:eof - \ && exists('l:file_start') \ && exists('l:block_start') " End of old file: flag previous file lines for deletion if no changes, |