diff options
| author | Christian Clason <christian.clason@uni-due.de> | 2021-09-09 08:43:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 08:43:20 +0200 |
| commit | ed0c747788d32961633db41ed224464e515dd2b8 (patch) | |
| tree | b77e4c90708273b9709361eb588bf9b8e6483fb4 /src/nvim/diff.c | |
| parent | c1f573fbc94aecd0f5841f7eb671be1a0a29758c (diff) | |
| parent | fbe88ef8f5a4c1f7d42f997843bbf27119e28965 (diff) | |
| download | rneovim-ed0c747788d32961633db41ed224464e515dd2b8.tar.gz rneovim-ed0c747788d32961633db41ed224464e515dd2b8.tar.bz2 rneovim-ed0c747788d32961633db41ed224464e515dd2b8.zip | |
Merge pull request #15602 from clason/vim-8.2.3390
vim-patch:8.2.3390: included xdiff code is outdated
build: move src/nvim/xdiff to src/xdiff
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) { |