Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 3 insertions, 8 deletions

diff --git a/src/nvim/ugrid.c b/src/nvim/ugrid.c
index be1746983c..f02b9626cd 100644
--- a/src/nvim/ugrid.c
+++ b/src/nvim/ugrid.c
@@ -1,9 +1,7 @@
-// This is an open source non-commercial project. Dear PVS-Studio, please check
-// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #include <assert.h>
 #include <string.h>
 
+#include "nvim/grid.h"
 #include "nvim/memory.h"
 #include "nvim/ugrid.h"
 
@@ -63,10 +61,8 @@ void ugrid_scroll(UGrid *grid, int top, int bot, int left, int right, int count)
     step = -1;
   }
 
-  int i;
-
   // Copy cell data
-  for (i = start; i != stop; i += step) {
+  for (int i = start; i != stop; i += step) {
     UCell *target_row = grid->cells[i] + left;
     UCell *source_row = grid->cells[i + count] + left;
     assert(right >= left && left >= 0);
@@ -79,8 +75,7 @@ static void clear_region(UGrid *grid, int top, int bot, int left, int right, sat
 {
   for (int row = top; row <= bot; row++) {
     UGRID_FOREACH_CELL(grid, row, left, right + 1, {
-      cell->data[0] = ' ';
-      cell->data[1] = 0;
+      cell->data = schar_from_ascii(' ');
       cell->attr = attr;
     });
   }