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/ops.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/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 956b9c7758..bef0ebaeed 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -4964,7 +4964,7 @@ void cursor_pos_info(void) &char_count_cursor, len, eol_size); if (lnum == curbuf->b_ml.ml_line_count && !curbuf->b_p_eol - && curbuf->b_p_bin + && (curbuf->b_p_bin || !curbuf->b_p_fixeol) && (long)STRLEN(s) < len) byte_count_cursor -= eol_size; } @@ -4985,7 +4985,7 @@ void cursor_pos_info(void) } /* Correction for when last line doesn't have an EOL. */ - if (!curbuf->b_p_eol && curbuf->b_p_bin) + if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) byte_count -= eol_size; if (l_VIsual_active) { |