summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-04-03 22:02:55 +0200
committerBram Moolenaar <Bram@vim.org>2017-04-03 22:02:55 +0200
commita1d5fa65bc7e8a548858e9c295a192b63dcd011b (patch)
treea79ab5d986de4b34498e9873e1fe517cc4111357 /src/eval.c
parent04000560ca81cc2608b291d0990e661b41ca8c68 (diff)
downloadvim-git-a1d5fa65bc7e8a548858e9c295a192b63dcd011b.tar.gz
patch 8.0.0542: getpos() can return a negative line numberv8.0.0542
Problem: getpos() can return a negative line number. (haya14busa) Solution: Handle a zero topline and botline. (closes #1613)
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index e588c23e9..261ece85c 100644
--- 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;
}
}