diff options
| author | Johan Klokkhammer Helsing <johanhelsing@gmail.com> | 2015-10-14 20:22:01 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johanhelsing@gmail.com> | 2015-11-22 20:06:07 +0100 |
| commit | 98f9ff730b276fe029764ad1d657f3eba40a7068 (patch) | |
| tree | 4482324350a7437749c1eaa78a4954fcb934e9e3 | |
| parent | 8d07058097fe2f36848e16aae6176fc045316371 (diff) | |
| download | rneovim-98f9ff730b276fe029764ad1d657f3eba40a7068.tar.gz rneovim-98f9ff730b276fe029764ad1d657f3eba40a7068.tar.bz2 rneovim-98f9ff730b276fe029764ad1d657f3eba40a7068.zip | |
vim-patch:7.4.898
Problem: The 'fixendofline' option is set on with ":edit".
Solution: Don't set the option when clearing a buffer. (Yasuhiro Matsumoto)
https://github.com/vim/vim/commit/04dfd512293e951479aec2378753b946c39bea87
| -rw-r--r-- | src/nvim/buffer.c | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 48d26f84eb..6fc08643af 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -479,7 +479,6 @@ void buf_clear_file(buf_T *buf) buf->b_ml.ml_line_count = 1; unchanged(buf, TRUE); buf->b_p_eol = TRUE; - buf->b_p_fixeol = true; buf->b_start_eol = TRUE; buf->b_p_bomb = FALSE; buf->b_start_bomb = FALSE; diff --git a/src/nvim/version.c b/src/nvim/version.c index f1d2028269..e6fd84177b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -98,7 +98,7 @@ static int included_patches[] = { // 901, // 900 NA // 899 NA - // 898, + 898, // 897, // 896, // 895, |