Mercurial > vim
diff src/eval.c @ 11313:327a04a762f6 v8.0.0542
patch 8.0.0542: getpos() can return a negative line number
commit https://github.com/vim/vim/commit/a1d5fa65bc7e8a548858e9c295a192b63dcd011b
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Apr 3 22:02:55 2017 +0200
patch 8.0.0542: getpos() can return a negative line number
Problem: getpos() can return a negative line number. (haya14busa)
Solution: Handle a zero topline and botline. (closes https://github.com/vim/vim/issues/1613)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 03 Apr 2017 22:15:05 +0200 |
| parents | 13544aa85dc0 |
| children | 3e799a37ea22 |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -6120,13 +6120,16 @@ var2fpos( 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; } }