diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-10-01 21:05:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 21:05:12 +0800 |
| commit | b40c70f2fcaf709d2bf8b3209ae1e2f617d8e852 (patch) | |
| tree | 489e52a8c585f8f1fccfdddf814ac763ad2b7522 /src/nvim/diff.c | |
| parent | 9b3045103f7d56e5ccd0574dcb93e953b72d5f50 (diff) | |
| parent | 01c51a491330bd10202c73aff92c0978984c0692 (diff) | |
| download | rneovim-b40c70f2fcaf709d2bf8b3209ae1e2f617d8e852.tar.gz rneovim-b40c70f2fcaf709d2bf8b3209ae1e2f617d8e852.tar.bz2 rneovim-b40c70f2fcaf709d2bf8b3209ae1e2f617d8e852.zip | |
Merge pull request #25456 from zeertzjq/vim-9.0.1958
vim-patch:9.0.{1958,1960,1961,1968}: string option completion
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 3ab1da76f4..cb76cf17fc 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2467,6 +2467,7 @@ int diffopt_changed(void) char *p = p_dip; while (*p != NUL) { + // Note: Keep this in sync with p_dip_values if (strncmp(p, "filler", 6) == 0) { p += 6; diff_flags_new |= DIFF_FILLER; @@ -2513,6 +2514,7 @@ int diffopt_changed(void) p += 8; diff_flags_new |= DIFF_INTERNAL; } else if (strncmp(p, "algorithm:", 10) == 0) { + // Note: Keep this in sync with p_dip_algorithm_values. p += 10; if (strncmp(p, "myers", 5) == 0) { p += 5; |