diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-01-27 14:15:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 14:15:08 +0100 |
| commit | 8171e96b9640c54eb67a8e5d1082f1fd6e794f23 (patch) | |
| tree | 7ef2ee67b4328b7e5478a74bfccc6d5ec6eb8d38 /src/nvim/cursor.c | |
| parent | f2398a766e094d74ab19f3037872abbc97c16728 (diff) | |
| parent | de16c0bf6445f92f2b6e92ba3253d581e5562178 (diff) | |
| download | rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.tar.gz rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.tar.bz2 rneovim-8171e96b9640c54eb67a8e5d1082f1fd6e794f23.zip | |
Merge pull request #9551 from bfredl/multiterm
Fix :terminal resizing, and some multigrid size cleanup
Diffstat (limited to 'src/nvim/cursor.c')
| -rw-r--r-- | src/nvim/cursor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c index 6c1bd01ff5..bc14761877 100644 --- a/src/nvim/cursor.c +++ b/src/nvim/cursor.c @@ -121,11 +121,11 @@ static int coladvance2( --curwin->w_curswant; } } else { - int width = curwin->w_grid.Columns - win_col_off(curwin); + int width = curwin->w_width_inner - win_col_off(curwin); if (finetune && curwin->w_p_wrap - && curwin->w_grid.Columns != 0 + && curwin->w_width_inner != 0 && wcol >= (colnr_T)width) { csize = linetabsize(line); if (csize > 0) @@ -230,7 +230,7 @@ static int coladvance2( int b = (int)wcol - (int)col; // The difference between wcol and col is used to set coladd. - if (b > 0 && b < (MAXCOL - 2 * curwin->w_grid.Columns)) { + if (b > 0 && b < (MAXCOL - 2 * curwin->w_width_inner)) { pos->coladd = b; } @@ -444,7 +444,7 @@ bool leftcol_changed(void) bool retval = false; changed_cline_bef_curs(); - lastcol = curwin->w_leftcol + curwin->w_grid.Columns - curwin_col_off() - 1; + lastcol = curwin->w_leftcol + curwin->w_width_inner - curwin_col_off() - 1; validate_virtcol(); /* |