aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/tui
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-01-03 00:44:36 +0100
committerGitHub <noreply@github.com>2019-01-03 00:44:36 +0100
commit0afb5fa70aa6b5bc1b007aca5309a5bafd63d868 (patch)
tree4c28823971a9411f1fccac4eacd7743bb745f51d /src/nvim/tui
parent9f19e8d29dcece387d0aec1dc8c96995276ba61f (diff)
parent7ede14d191b1220ac872a24433825997d62ff7ec (diff)
downloadrneovim-0afb5fa70aa6b5bc1b007aca5309a5bafd63d868.tar.gz
rneovim-0afb5fa70aa6b5bc1b007aca5309a5bafd63d868.tar.bz2
rneovim-0afb5fa70aa6b5bc1b007aca5309a5bafd63d868.zip
Merge #9425 'build: enable -Wshadow'
Diffstat (limited to 'src/nvim/tui')
-rw-r--r--src/nvim/tui/input.c4
-rw-r--r--src/nvim/tui/tui.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 0362820687..a0df80a8e8 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -352,8 +352,8 @@ static bool handle_forced_escape(TermInput *input)
return false;
}
-static void read_cb(Stream *stream, RBuffer *buf, size_t c, void *data,
- bool eof)
+static void read_cb(Stream *stream, RBuffer *buf, size_t count_, void *data,
+ bool eof)
{
TermInput *input = data;
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index df8522bff2..64e368ffb3 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1174,7 +1174,7 @@ static void tui_flush(UI *ui)
}
UGRID_FOREACH_CELL(grid, row, r.left, clear_col, {
- cursor_goto(ui, row, col);
+ cursor_goto(ui, row, curcol);
print_cell(ui, cell);
});
if (clear_col < r.right) {
@@ -1283,7 +1283,7 @@ static void tui_raw_line(UI *ui, Integer g, Integer linerow, Integer startcol,
grid->cells[linerow][c].attr = attrs[c-startcol];
}
UGRID_FOREACH_CELL(grid, (int)linerow, (int)startcol, (int)endcol, {
- cursor_goto(ui, (int)linerow, col);
+ cursor_goto(ui, (int)linerow, curcol);
print_cell(ui, cell);
});