diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-03-09 08:15:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 08:15:18 +0800 |
| commit | 205b3765f2c04e3839b15a8d1ce79bd7ea8e4d3d (patch) | |
| tree | b3db8da594fd829224607a11d21b43b3d329b76f /src/nvim/marktree.c | |
| parent | f33cea4682340ea2b622fa879dd6fca2c80ea1d5 (diff) | |
| parent | ff032f2710974dcf5930187f1925534da93db199 (diff) | |
| download | rneovim-205b3765f2c04e3839b15a8d1ce79bd7ea8e4d3d.tar.gz rneovim-205b3765f2c04e3839b15a8d1ce79bd7ea8e4d3d.tar.bz2 rneovim-205b3765f2c04e3839b15a8d1ce79bd7ea8e4d3d.zip | |
Merge pull request #17622 from dundargoc/refactor/clang-tidy/remove-redundant-casts
refactor/clang tidy/remove redundant casts
Diffstat (limited to 'src/nvim/marktree.c')
| -rw-r--r-- | src/nvim/marktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/marktree.c b/src/nvim/marktree.c index 918db8b76c..d2354dbf6b 100644 --- a/src/nvim/marktree.c +++ b/src/nvim/marktree.c @@ -558,8 +558,8 @@ void marktree_revise(MarkTree *b, MarkTreeIter *itr, uint8_t decor_level, mtkey_ { // TODO(bfredl): clean up this mess and re-instantiate &= and |= forms // once we upgrade to a non-broken version of gcc in functionaltest-lua CI - rawkey(itr).flags = (uint16_t)((uint16_t)rawkey(itr).flags & (uint16_t)~MT_FLAG_DECOR_MASK); - rawkey(itr).flags = (uint16_t)((uint16_t)rawkey(itr).flags + rawkey(itr).flags = (uint16_t)(rawkey(itr).flags & (uint16_t)~MT_FLAG_DECOR_MASK); + rawkey(itr).flags = (uint16_t)(rawkey(itr).flags | (uint16_t)(decor_level << MT_FLAG_DECOR_OFFSET) | (uint16_t)(key.flags & MT_FLAG_DECOR_MASK)); rawkey(itr).decor_full = key.decor_full; |