From 98f9ff730b276fe029764ad1d657f3eba40a7068 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 14 Oct 2015 20:22:01 +0200 Subject: 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 --- src/nvim/buffer.c | 1 - src/nvim/version.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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, -- cgit