From: Bram Moolenaar Date: Tue, 13 Oct 2015 18:55:50 +0000 (+0200) Subject: patch 7.4.898 X-Git-Tag: v7.4.898 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04dfd512293e951479aec2378753b946c39bea87;p=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) --- diff --git a/src/buffer.c b/src/buffer.c index 4623e0ad3..5d4170fdc 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -547,7 +547,6 @@ buf_clear_file(buf) buf->b_shortname = FALSE; #endif buf->b_p_eol = TRUE; - buf->b_p_fixeol = TRUE; buf->b_start_eol = TRUE; #ifdef FEAT_MBYTE buf->b_p_bomb = FALSE; diff --git a/src/version.c b/src/version.c index 71e1a2a8f..a2aec2cd5 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 898, /**/ 897, /**/