Permalink
Browse files

patch 8.0.0571: negative line number when using :z^ in an empty buffer

Problem:    The cursor line number becomes negative when using :z^ in an empty
            buffer. (neovim #6557)
Solution:   Correct the line number.  Also reset the column.
  • Loading branch information...
brammool committed Apr 20, 2017
1 parent c039441 commit a364cdb648ae009fa7aa05382f5659335683d349
Showing with 17 additions and 2 deletions.
  1. +7 −1 src/ex_cmds.c
  2. +8 −1 src/testdir/test_ex_z.vim
  3. +2 −0 src/version.c
View
@@ -4664,6 +4664,8 @@ ex_z(exarg_T *eap)
if (curs > curbuf->b_ml.ml_line_count)
curs = curbuf->b_ml.ml_line_count;
else if (curs < 1)
curs = 1;
for (i = start; i <= end; i++)
{
@@ -4686,7 +4688,11 @@ ex_z(exarg_T *eap)
}
}
curwin->w_cursor.lnum = curs;
if (curwin->w_cursor.lnum != curs)
{
curwin->w_cursor.lnum = curs;
curwin->w_cursor.col = 0;
}
ex_no_reprint = TRUE;
}
@@ -68,11 +68,18 @@ func Test_z()
bw!
endfunc
func Test_z_bug()
func Test_z_overflow()
" This used to access invalid memory as a result of an integer overflow
" and freeze vim.
normal ox
normal Heat
z777777776666666
')
endfunc
func Test_z_negative_lnum()
new
z^
call assert_equal(1, line('.'))
bwipe!
endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
571,
/**/
570,
/**/

0 comments on commit a364cdb

Please sign in to comment.