diff options
| author | Christian Brabandt <cb@256bit.org> | 2021-08-31 20:46:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-31 20:46:39 +0200 |
| commit | ba02e4720f863fdb456e7023520f0a354eec0dcf (patch) | |
| tree | 84db07f22b6ef54c238bc462823703ad11ff3872 /src/diff.c | |
| parent | dca29d9cf46cd1d4d4519211c7af78b6b1c56960 (diff) | |
| download | vim-git-ba02e4720f863fdb456e7023520f0a354eec0dcf.tar.gz | |
patch 8.2.3390: included xdiff code is outdatedv8.2.3390
Problem: Included xdiff code is outdated.
Solution: Sync with xdiff in git 2.33. (Christian Brabandt, closes #8431)
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c index aea1c0e70..7bdfa4819 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1095,7 +1095,7 @@ 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) |