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/lua/xdiff.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/lua/xdiff.c')
| -rw-r--r-- | src/nvim/lua/xdiff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/lua/xdiff.c b/src/nvim/lua/xdiff.c index d50f874a82..ae0ea00765 100644 --- a/src/nvim/lua/xdiff.c +++ b/src/nvim/lua/xdiff.c @@ -8,7 +8,7 @@ #include <string.h> #include "nvim/vim.h" -#include "nvim/xdiff/xdiff.h" +#include "xdiff/xdiff.h" #include "nvim/lua/xdiff.h" #include "nvim/lua/converter.h" #include "nvim/lua/executor.h" @@ -294,7 +294,7 @@ int nlua_xdl_diff(lua_State *lstate) case kNluaXdiffModeUnified: luaL_buffinit(lstate, &buf); ecb.priv = &buf; - ecb.outf = write_string; + ecb.out_line = write_string; break; case kNluaXdiffModeOnHunkCB: priv = xmalloc(sizeof(*priv)); |