summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-10-13 20:55:50 +0200
committerBram Moolenaar <Bram@vim.org>2015-10-13 20:55:50 +0200
commit04dfd512293e951479aec2378753b946c39bea87 (patch)
tree0ff95086cffcb9fc61a4cba2f6d540cc08cd6034
parent4e86150ec5b5158da92b28938ea55819dc890a14 (diff)
downloadvim-git-04dfd512293e951479aec2378753b946c39bea87.tar.gz
patch 7.4.898v7.4.898
Problem: The 'fixendofline' option is set on with ":edit". Solution: Don't set the option when clearing a buffer. (Yasuhiro Matsumoto)
-rw-r--r--src/buffer.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
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
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 898,
+/**/
897,
/**/
896,