aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/lua
diff options
context:
space:
mode:
authorLewis Russell <lewis6991@gmail.com>2024-09-30 12:09:36 +0100
committerGitHub <noreply@github.com>2024-09-30 12:09:36 +0100
commit2c88cfcac42d0a4e0b1a1396539b5add807c336c (patch)
tree0301447a10df4021c0157e5e96738f4a6adbcc0d /src/nvim/lua
parent20251be15a4ad3f6e7016450ca3338d52b2f0951 (diff)
parent0fb5299e53cc0d7a5c03c333b1ed79262a0db3f9 (diff)
downloadrneovim-2c88cfcac42d0a4e0b1a1396539b5add807c336c.tar.gz
rneovim-2c88cfcac42d0a4e0b1a1396539b5add807c336c.tar.bz2
rneovim-2c88cfcac42d0a4e0b1a1396539b5add807c336c.zip
Merge pull request #30526 from lewis6991/fix/linematchnul
Diffstat (limited to 'src/nvim/lua')
-rw-r--r--src/nvim/lua/xdiff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/lua/xdiff.c b/src/nvim/lua/xdiff.c
index 8d791a7e74..b9f96abf73 100644
--- a/src/nvim/lua/xdiff.c
+++ b/src/nvim/lua/xdiff.c
@@ -67,11 +67,11 @@ static void get_linematch_results(lua_State *lstate, mmfile_t *ma, mmfile_t *mb,
int count_a, int start_b, int count_b, bool iwhite)
{
// get the pointer to char of the start of the diff to pass it to linematch algorithm
- const char *diff_begin[2] = { ma->ptr, mb->ptr };
- int diff_length[2] = { count_a, count_b };
+ mmfile_t ma0 = fastforward_buf_to_lnum(*ma, (linenr_T)start_a + 1);
+ mmfile_t mb0 = fastforward_buf_to_lnum(*mb, (linenr_T)start_b + 1);
- fastforward_buf_to_lnum(&diff_begin[0], (linenr_T)start_a + 1);
- fastforward_buf_to_lnum(&diff_begin[1], (linenr_T)start_b + 1);
+ const mmfile_t *diff_begin[2] = { &ma0, &mb0 };
+ int diff_length[2] = { count_a, count_b };
int *decisions = NULL;
size_t decisions_length = linematch_nbuffers(diff_begin, diff_length, 2, &decisions, iwhite);