diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-06-12 20:13:52 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-12 20:13:52 -0400 |
| commit | 168575f3f73f79185db0abdb91be364c0d0f29f9 (patch) | |
| tree | c9bbf386710d6c57021e03811b2483bcd574812f /src/nvim/popupmnu.c | |
| parent | 284a38a065f6cedd37f8f7d75c1953884653503c (diff) | |
| parent | 1ff8ed7b823623e9abd224f78fbce7e20ce66f5d (diff) | |
| download | rneovim-168575f3f73f79185db0abdb91be364c0d0f29f9.tar.gz rneovim-168575f3f73f79185db0abdb91be364c0d0f29f9.tar.bz2 rneovim-168575f3f73f79185db0abdb91be364c0d0f29f9.zip | |
Merge #774 'Move defines from vim.h to other header files'
Diffstat (limited to 'src/nvim/popupmnu.c')
| -rw-r--r-- | src/nvim/popupmnu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 97db6efe37..b0ed3047ae 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -73,7 +73,7 @@ redo: validate_cursor_col(); pum_array = NULL; - row = curwin->w_wrow + W_WINROW(curwin); + row = curwin->w_wrow + curwin->w_winrow; if (firstwin->w_p_pvw) { top_clear = firstwin->w_height; @@ -189,9 +189,9 @@ redo: // Calculate column if (curwin->w_p_rl) { - col = W_WINCOL(curwin) + W_WIDTH(curwin) - curwin->w_wcol - 1; + col = curwin->w_wincol + curwin->w_width - curwin->w_wcol - 1; } else { - col = W_WINCOL(curwin) + curwin->w_wcol; + col = curwin->w_wincol + curwin->w_wcol; } // if there are more items than room we need a scrollbar @@ -299,7 +299,7 @@ void pum_redraw(void) // prepend a space if there is room if (curwin->w_p_rl) { - if (pum_col < W_WINCOL(curwin) + W_WIDTH(curwin) - 1) { + if (pum_col < curwin->w_wincol + curwin->w_width - 1) { screen_putchar(' ', row, pum_col + 1, attr); } } else if (pum_col > 0) { |