diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-03 22:02:55 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-03 22:02:55 +0200 |
| commit | a1d5fa65bc7e8a548858e9c295a192b63dcd011b (patch) | |
| tree | a79ab5d986de4b34498e9873e1fe517cc4111357 | |
| parent | 04000560ca81cc2608b291d0990e661b41ca8c68 (diff) | |
| download | vim-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)
| -rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
| -rw-r--r-- | src/eval.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 0eccd618a..6c3c0da8b 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5413,8 +5413,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/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; } } diff --git a/src/version.c b/src/version.c index eef36b434..d22f16553 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 542, +/**/ 541, /**/ 540, |