updated for version 7.1-201

diff --git a/src/fileio.c b/src/fileio.c
index bcf355250cf463d6e86beb81e2ee6f62e68e1298..40905cfea8792131ade7152a4783bedfef35c1dc 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -221,11 +221,12 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
 {
     int                fd = 0;
     int                newfile = (flags & READ_NEW);
-    int                set_options = newfile || (eap != NULL && eap->read_edit);
     int                check_readonly;
     int                filtering = (flags & READ_FILTER);
     int                read_stdin = (flags & READ_STDIN);
     int                read_buffer = (flags & READ_BUFFER);
+    int                set_options = newfile || read_buffer
+                                          || (eap != NULL && eap->read_edit);
     linenr_T   read_buf_lnum = 1;      /* next line to read from curbuf */
     colnr_T    read_buf_col = 0;       /* next char to read from this line */
     char_u     c;
@@ -650,8 +651,13 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
 
     if (set_options)
     {
-       curbuf->b_p_eol = TRUE;
-       curbuf->b_start_eol = TRUE;
+       /* Don't change 'eol' if reading from buffer as it will already be
+        * correctly set when reading stdin. */
+       if (!read_buffer)
+       {
+           curbuf->b_p_eol = TRUE;
+           curbuf->b_start_eol = TRUE;
+       }
 #ifdef FEAT_MBYTE
        curbuf->b_p_bomb = FALSE;
        curbuf->b_start_bomb = FALSE;

diff --git a/src/version.c b/src/version.c
index c8c8834f4394e4d2e75931bbd4b5de2db3e69312..ce139241753a46db2b1cea409af4efeda982fa3f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    201,
 /**/
     200,
 /**/