diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-13 00:09:07 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-13 00:09:07 -0500 |
| commit | aca51f3d9314c70a4df0f15bcb84edd2dc127ff0 (patch) | |
| tree | b92532b6cec03547d223de16f6219b6f9f653c9a /src/nvim/memline.c | |
| parent | ebdb802bf55a45eb7e4fa59cdb0689e7a3323f86 (diff) | |
| parent | 98f9ff730b276fe029764ad1d657f3eba40a7068 (diff) | |
| download | rneovim-aca51f3d9314c70a4df0f15bcb84edd2dc127ff0.tar.gz rneovim-aca51f3d9314c70a4df0f15bcb84edd2dc127ff0.tar.bz2 rneovim-aca51f3d9314c70a4df0f15bcb84edd2dc127ff0.zip | |
Merge #3443 'vim-patch:7.4.{785,795,898}'
Diffstat (limited to 'src/nvim/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 0ba8dd98d0..c91a25df6e 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3954,8 +3954,10 @@ long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp) if (ffdos) size += lnum - 1; - /* Don't count the last line break if 'bin' and 'noeol'. */ - if (buf->b_p_bin && !buf->b_p_eol && buf->b_ml.ml_line_count == lnum) { + /* 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) { size -= ffdos + 1; } } |