diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-15 21:54:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 21:54:04 -0400 |
| commit | d8e7fbe193cb3c811e305873a1f99b9f02d36d5f (patch) | |
| tree | 1c28ab9cb3df836e149a92ca878548b1b4758f1e /src/nvim/syntax.c | |
| parent | b8c0fac762f4b03f0438d3888ccf3f200648b882 (diff) | |
| parent | 97288e73c27d45b0fadbd6efa437fe54bc58b5e3 (diff) | |
| download | rneovim-d8e7fbe193cb3c811e305873a1f99b9f02d36d5f.tar.gz rneovim-d8e7fbe193cb3c811e305873a1f99b9f02d36d5f.tar.bz2 rneovim-d8e7fbe193cb3c811e305873a1f99b9f02d36d5f.zip | |
Merge pull request #14367 from janlazo/vim-8.2.2046
vim-patch:8.2.{265,2761,2764}
Diffstat (limited to 'src/nvim/syntax.c')
| -rw-r--r-- | src/nvim/syntax.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 825aef1465..77a751e5ad 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -5306,13 +5306,17 @@ get_id_list( xfree(name); break; } - if (name[1] == 'A') - id = SYNID_ALLBUT; - else if (name[1] == 'T') - id = SYNID_TOP; - else - id = SYNID_CONTAINED; - id += current_syn_inc_tag; + if (name[1] == 'A') { + id = SYNID_ALLBUT + current_syn_inc_tag; + } else if (name[1] == 'T') { + if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER) { + id = curwin->w_s->b_syn_topgrp; + } else { + id = SYNID_TOP + current_syn_inc_tag; + } + } else { + id = SYNID_CONTAINED + current_syn_inc_tag; + } } else if (name[1] == '@') { if (skip) { id = -1; |