diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-08-21 09:41:41 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-08-21 10:20:17 -0400 |
| commit | 822ae1a81c6dd3bf898323706261d6bcf7e75e11 (patch) | |
| tree | cc814912ee6f69023a1bc9054bbf3985b2c7b3f5 | |
| parent | 38075200015e0e47d930a0ac7550546fd4cb2f9e (diff) | |
| download | rneovim-822ae1a81c6dd3bf898323706261d6bcf7e75e11.tar.gz rneovim-822ae1a81c6dd3bf898323706261d6bcf7e75e11.tar.bz2 rneovim-822ae1a81c6dd3bf898323706261d6bcf7e75e11.zip | |
vim-patch:8.1.0303: line2byte() is wrong for last line with 'noeol'
Problem: line2byte() is wrong for last line with 'noeol' and 'nofixeol'.
Solution: Fix off-by-one error. (Shane Harper, closes vim/vim#3351)
https://github.com/vim/vim/commit/c26f7c60532a37a2bf0a5e69aa81081b440dfc38
| -rw-r--r-- | src/nvim/memline.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_functions.vim | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 3d5f4e8f3a..fbd376641f 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3955,7 +3955,7 @@ long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp) /* Don't count the last line break if 'noeol' and ('bin' or * 'nofixeol'). */ if ((!buf->b_p_fixeol || buf->b_p_bin) && !buf->b_p_eol - && buf->b_ml.ml_line_count == lnum) { + && lnum > buf->b_ml.ml_line_count) { size -= ffdos + 1; } } diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim index e2a035b0b2..8fde63b55f 100644 --- a/src/nvim/testdir/test_functions.vim +++ b/src/nvim/testdir/test_functions.vim @@ -701,6 +701,7 @@ endfunc func Test_byte2line_line2byte() new + set endofline call setline(1, ['a', 'bc', 'd']) set fileformat=unix @@ -721,7 +722,16 @@ func Test_byte2line_line2byte() call assert_equal([-1, -1, 1, 4, 8, 11, -1], \ map(range(-1, 5), 'line2byte(v:val)')) - set fileformat& + bw! + set noendofline nofixendofline + normal a- + for ff in ["unix", "mac", "dos"] + let &fileformat = ff + call assert_equal(1, line2byte(1)) + call assert_equal(2, line2byte(2)) " line2byte(line("$") + 1) is the buffer size plus one (as per :help line2byte). + endfor + + set endofline& fixendofline& fileformat& bw! endfunc |