diff options
| author | Johan Klokkhammer Helsing <johanhelsing@gmail.com> | 2015-10-08 20:17:25 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johanhelsing@gmail.com> | 2015-11-22 20:03:41 +0100 |
| commit | a86d4b323e2f5ee9fec791ca1dcce7a608de575d (patch) | |
| tree | 21996ffb28447451e04977703a434767cf437ec3 /src/nvim/os/shell.c | |
| parent | 1fbb56795d16783f9a97e25e3b71ab3ac2a644dc (diff) | |
| download | rneovim-a86d4b323e2f5ee9fec791ca1dcce7a608de575d.tar.gz rneovim-a86d4b323e2f5ee9fec791ca1dcce7a608de575d.tar.bz2 rneovim-a86d4b323e2f5ee9fec791ca1dcce7a608de575d.zip | |
vim-patch:7.4.785
Problem: On some systems automatically adding the missing EOL causes
problems. Setting 'binary' has too many side effects.
Solution: Add the 'fixeol' option, default on. (Pavel Samarkin)
https://github.com/vim/vim/commit/34d72d4b6c1a2b04a214d8a49b7d22c97bc7a8bc
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 |