mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 03:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(diff): set default diff flags properly (#35450)

Browse Source
This commit is contained in:
zeertzjq
2025-08-24 14:42:10 +08:00
committed by GitHub
parent 810a234978
commit 0b8a9bde0e
5 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/diff.c
View File

@@ -95,10 +95,10 @@ static bool diff_need_update = false; // ex_diffupdate needs to be called
#define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
#define ALL_INLINE (DIFF_INLINE_NONE | DIFF_INLINE_SIMPLE | DIFF_INLINE_CHAR | DIFF_INLINE_WORD)
#define ALL_INLINE_DIFF (DIFF_INLINE_CHAR | DIFF_INLINE_WORD)
static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF;
static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF | DIFF_LINEMATCH;
static int diff_algorithm = 0;
static int linematch_lines = 0;
static int linematch_lines = 40;
#define LBUFLEN 50 // length of line in diff file