Mercurial > vim

comparison src/diff.c @ 25709:d5142d87f898 v8.2.3390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3390: included xdiff code is outdated Commit: https://github.com/vim/vim/commit/ba02e4720f863fdb456e7023520f0a354eec0dcf Author: Christian Brabandt <cb@256bit.org> Date: Tue Aug 31 20:46:39 2021 +0200 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 https://github.com/vim/vim/issues/8431)
author Bram Moolenaar <Bram@vim.org>
date Tue, 31 Aug 2021 21:00:05 +0200
parents e8e2c4d33b9b
children d3f992bc6ef8
comparison
equal deleted inserted replaced
25708:a1f90f486bf7 25709:d5142d87f898
1093 if (diff_flags & DIFF_IBLANK) 1093 if (diff_flags & DIFF_IBLANK)
1094 param.flags |= XDF_IGNORE_BLANK_LINES; 1094 param.flags |= XDF_IGNORE_BLANK_LINES;
1095 1095
1096 emit_cfg.ctxlen = 0; // don't need any diff_context here 1096 emit_cfg.ctxlen = 0; // don't need any diff_context here
1097 emit_cb.priv = &diffio->dio_diff; 1097 emit_cb.priv = &diffio->dio_diff;
1098 emit_cb.outf = xdiff_out; 1098 emit_cb.out_line = xdiff_out;
1099 if (xdl_diff(&diffio->dio_orig.din_mmfile, 1099 if (xdl_diff(&diffio->dio_orig.din_mmfile,
1100 &diffio->dio_new.din_mmfile, 1100 &diffio->dio_new.din_mmfile,
1101 &param, &emit_cfg, &emit_cb) < 0) 1101 &param, &emit_cfg, &emit_cb) < 0)
1102 { 1102 {
1103 emsg(_("E960: Problem creating the internal diff")); 1103 emsg(_("E960: Problem creating the internal diff"));