From 3c24a6c3176fc461295f9bc8119768dcea579ee3 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 19 Jun 2018 04:50:52 -0400 Subject: 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 --- src/nvim/eval.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 */ -- cgit