diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-08-02 20:19:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-02 20:19:48 +0200 |
| commit | 4ed5204bc9d5811cd45209476ac1b9e2c2b74146 (patch) | |
| tree | b3d811af95576072856a07f0dffcb86c76de6604 /src/nvim/screen.c | |
| parent | 480515e4426865c37a42a452432b3463f0ab40a7 (diff) | |
| parent | ea515f8ca1fa63cfad516a956cd78ef371f91955 (diff) | |
| download | rneovim-4ed5204bc9d5811cd45209476ac1b9e2c2b74146.tar.gz rneovim-4ed5204bc9d5811cd45209476ac1b9e2c2b74146.tar.bz2 rneovim-4ed5204bc9d5811cd45209476ac1b9e2c2b74146.zip | |
Merge pull request #12665 from janlazo/vim-8.2.1254
vim-patch:8.0.1774,8.1.{192,194,255,264,1202,2172,2340},8.2.{62,71,72,1004,1254,1259,1265,1267,1292,1295}
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 7bed747e9a..c5723035d6 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3068,10 +3068,12 @@ win_line ( } // When still displaying '$' of change command, stop at cursor - if ((dollar_vcol >= 0 && wp == curwin - && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol - && filler_todo <= 0) - || (number_only && draw_state > WL_NR)) { + if (((dollar_vcol >= 0 + && wp == curwin + && lnum == wp->w_cursor.lnum + && vcol >= (long)wp->w_virtcol) + || (number_only && draw_state > WL_NR)) + && filler_todo <= 0) { grid_put_linebuf(grid, row, 0, col, -grid->Columns, wp->w_p_rl, wp, wp->w_hl_attr_normal, false); // Pretend we have finished updating the window. Except when @@ -3476,6 +3478,7 @@ win_line ( * Only do this when there is no syntax highlighting, the * @Spell cluster is not used or the current syntax item * contains the @Spell cluster. */ + v = (long)(ptr - line); if (has_spell && v >= word_end && v > cur_checked_col) { spell_attr = 0; if (!attr_pri) { |