aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorLuuk van Baal <luukvbaal@gmail.com>2024-11-23 23:03:46 +0100
committerluukvbaal <luukvbaal@gmail.com>2025-02-25 13:09:01 +0100
commitf58e7d5fac1c4f63f0ba3e59134591239182910e (patch)
tree1b180a27cb3c4f4f521188b8e6416d3adfc79206 /src/nvim/diff.c
parenta31ccc3b1f65fd86780c03fec9c6e1bf56e30e35 (diff)
downloadrneovim-f58e7d5fac1c4f63f0ba3e59134591239182910e.tar.gz
rneovim-f58e7d5fac1c4f63f0ba3e59134591239182910e.tar.bz2
rneovim-f58e7d5fac1c4f63f0ba3e59134591239182910e.zip
feat(marks): add conceal_lines to nvim_buf_set_extmark()
Implement an extmark property that conceals lines vertically.
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 68441f7adc..4a4d2baf94 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -24,6 +24,7 @@
#include "nvim/change.h"
#include "nvim/charset.h"
#include "nvim/cursor.h"
+#include "nvim/decoration.h"
#include "nvim/diff.h"
#include "nvim/drawscreen.h"
#include "nvim/errors.h"
@@ -2107,7 +2108,7 @@ int diff_check_with_linestatus(win_T *wp, linenr_T lnum, int *linestatus)
}
// A closed fold never has filler lines.
- if (hasFolding(wp, lnum, NULL, NULL)) {
+ if (hasFolding(wp, lnum, NULL, NULL) || decor_conceal_line(wp, lnum - 1, false)) {
return 0;
}