diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-06-19 04:50:52 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-19 10:50:52 +0200 |
| commit | 3c24a6c3176fc461295f9bc8119768dcea579ee3 (patch) | |
| tree | 507287079cdef21bbc9c495c8af4664b06e9e7d5 | |
| parent | b148213366528a710d8c1515f9d8101934c50bef (diff) | |
| download | rneovim-3c24a6c3176fc461295f9bc8119768dcea579ee3.tar.gz rneovim-3c24a6c3176fc461295f9bc8119768dcea579ee3.tar.bz2 rneovim-3c24a6c3176fc461295f9bc8119768dcea579ee3.zip | |
vim-patch:8.0.0542: getpos() can return a negative line number (#8580)
Problem: getpos() can return a negative line number. (haya14busa)
Solution: Handle a zero topline and botline. (closes vim/vim#1613)
https://github.com/vim/vim/commit/a1d5fa65bc7e8a548858e9c295a192b63dcd011b
| -rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
| -rw-r--r-- | src/nvim/eval.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 197bc1d2d7..5738ea1446 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5182,8 +5182,10 @@ line({expr}) The result is a Number, which is the line number of the file $ the last line in the current buffer 'x position of mark x (if the mark is not set, 0 is returned) - w0 first line visible in current window - w$ last line visible in current window + w0 first line visible in current window (one if the + display isn't updated, e.g. in silent Ex mode) + w$ last line visible in current window (this is one + less than "w0" if no lines are visible) v In Visual mode: the start of the Visual area (the cursor is the end). When not in Visual mode returns the cursor position. Differs from |'<| in diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a7773e7c5e..5505f5f102 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -17838,11 +17838,14 @@ pos_T *var2fpos(const typval_T *const tv, const int dollar_lnum, pos.col = 0; if (name[1] == '0') { /* "w0": first visible line */ update_topline(); - pos.lnum = curwin->w_topline; + // In silent Ex mode topline is zero, but that's not a valid line + // number; use one instead. + pos.lnum = curwin->w_topline > 0 ? curwin->w_topline : 1; return &pos; } else if (name[1] == '$') { /* "w$": last visible line */ validate_botline(); - pos.lnum = curwin->w_botline - 1; + // In silent Ex mode botline is zero, return zero then. + pos.lnum = curwin->w_botline > 0 ? curwin->w_botline - 1 : 0; return &pos; } } else if (name[0] == '$') { /* last column or line */ |