diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2021-09-08 22:18:44 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2021-09-08 22:33:20 +0200 |
| commit | 69f4438d3586a10a0a4833788b9ba4cb5d2cc8fd (patch) | |
| tree | bb7a9b006b60b91c715a0958ba8b11dfff9cd254 /src/nvim/diff.c | |
| parent | 11289ad733e7b3f72ee583ccbfe982a78e099c6c (diff) | |
| download | rneovim-69f4438d3586a10a0a4833788b9ba4cb5d2cc8fd.tar.gz rneovim-69f4438d3586a10a0a4833788b9ba4cb5d2cc8fd.tar.bz2 rneovim-69f4438d3586a10a0a4833788b9ba4cb5d2cc8fd.zip | |
vim-patch:8.2.3390: included xdiff code is outdated
Problem: Included xdiff code is outdated.
Solution: Sync with xdiff in git 2.33. (Christian Brabandt, closes vim/vim#8431)
https://github.com/vim/vim/commit/ba02e4720f863fdb456e7023520f0a354eec0dcf
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 299175b28c..26269a44d2 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1059,7 +1059,7 @@ static int diff_file_internal(diffio_T *diffio) emit_cfg.ctxlen = 0; // don't need any diff_context here emit_cb.priv = &diffio->dio_diff; - emit_cb.outf = xdiff_out; + emit_cb.out_line = xdiff_out; if (xdl_diff(&diffio->dio_orig.din_mmfile, &diffio->dio_new.din_mmfile, ¶m, &emit_cfg, &emit_cb) < 0) { |