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 4623e0ad32c382337689ff6f1fe8f2e7950e68df..5d4170fdc6ec68c2450d5e933698572471ddbcda 100644 (file)
--- 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 71e1a2a8fdd3e239c8d6d5055f359debf4db98be..a2aec2cd58ece2fb0bccff03394dff115ada70f3 100644 (file)
--- 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,
 /**/