New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Unified diff format is not supported for external diffs #14521
Comments
Neovim is able to handle unified diffs fine - the only problem is that it didn't check for unified diffs when making sure that the diff tool worked. Closes neovim#14521
Thank you, @glacambre, for preparing a commit that solves this issue. My intention is to go a step further and refactor the diff.c code a bit. In particular I intend to extract the diff parsing code from
A better structure would be to have one generic |
In #14614 I've extracted |
vim-patch 8.2.2880 was merged in 6d932cc Does that fix this issue? |
nvim --version
: NVIM v0.5.0-dev+1302-g8a93d1028Steps to reproduce using
nvim -u NORC
Actual behaviour
Vim outputs
E97: Cannot create diffs
Expected behaviour
Vim turns on the diff mode without producing an error.
Notes
This is a bug, because documentation claims that Neovim should handle unified diffs (https://neovim.io/doc/user/diff.html, C^F "unified").
Neovim does handle unified diffs for internal diffs since cf1ffa9, but it seems that this functionality has not been plugged into external diffs, and there's even a smoke check that tests that the external diff complies with the ed-style format:
neovim/src/nvim/diff.c
Lines 985 to 992 in 1186f7d
The text was updated successfully, but these errors were encountered: