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/lua | |
| 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/lua')
| -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)); |