summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/import/dist/vimhelp.vim16
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 5 deletions
diff --git a/runtime/import/dist/vimhelp.vim b/runtime/import/dist/vimhelp.vim
index 1f587251b9..00cc79cfdb 100644
--- a/runtime/import/dist/vimhelp.vim
+++ b/runtime/import/dist/vimhelp.vim
@@ -9,11 +9,17 @@ export def HighlightGroups()
while getline(lnum) !~ '===' && lnum < line('$')
var word: string = getline(lnum)->matchstr('^\w\+\ze\t')
if word->hlexists()
- prop_type_add('help-hl-' .. word, {
- bufnr: buf,
- highlight: word,
- combine: false,
- })
+ var name = 'help-hl-' .. word
+ if prop_type_list({bufnr: buf})->match(name) == -1
+ prop_type_add('help-hl-' .. word, {
+ bufnr: buf,
+ highlight: word,
+ combine: false,
+ })
+ else
+ # was called before, delete existing properties
+ prop_remove({type: name, bufnr: buf})
+ endif
prop_add(lnum, 1, {length: word->strlen(), type: 'help-hl-' .. word})
endif
++lnum
diff --git a/src/version.c b/src/version.c
index f34a3226e9..480acfda11 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4942,
+/**/
4941,
/**/
4940,