diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-08-25 13:23:54 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2018-12-31 12:44:22 +0100 |
| commit | 1a896bc93f9c54cc8b973feba1963fd6b60a22b7 (patch) | |
| tree | 96fa5f32684b415e9cd03491b9b415480de54622 /src/nvim/window.c | |
| parent | 4f1dcf7c28c941cfe3c8516728b6543ad2854645 (diff) | |
| download | rneovim-1a896bc93f9c54cc8b973feba1963fd6b60a22b7.tar.gz rneovim-1a896bc93f9c54cc8b973feba1963fd6b60a22b7.tar.bz2 rneovim-1a896bc93f9c54cc8b973feba1963fd6b60a22b7.zip | |
multigrid: avoid allocation when not ext_multigrid.
Move grid specific functions from mbyte.c to screen.c
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index ba44d7334f..3d11076a40 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -3990,7 +3990,7 @@ void win_free_grid(win_T *wp, bool reinit) ui_call_grid_destroy(wp->w_grid.handle); wp->w_grid.handle = 0; } - free_screengrid(&wp->w_grid); + grid_free(&wp->w_grid); if (reinit) { // if a float is turned into a split and back into a float, the grid // data structure will be reused @@ -4100,7 +4100,7 @@ void win_alloc_lines(win_T *wp) { wp->w_lines_valid = 0; assert(wp->w_grid.Rows >= 0); - wp->w_lines = xcalloc(wp->w_grid.Rows + 1, sizeof(wline_T)); + wp->w_lines = xcalloc(MAX(wp->w_grid.Rows + 1, Rows), sizeof(wline_T)); } /* |