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/os/shell.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/os/shell.c')
| -rw-r--r-- | src/nvim/os/shell.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 57e25560de..3813c45726 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -418,7 +418,8 @@ static void read_input(DynamicBuffer *buf) // Finished a line, add a NL, unless this line should not have one. // FIXME need to make this more readable if (lnum != curbuf->b_op_end.lnum - || !curbuf->b_p_bin + || (!curbuf->b_p_bin + && curbuf->b_p_fixeol) || (lnum != curbuf->b_no_eol_lnum && (lnum != curbuf->b_ml.ml_line_count |