thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-201

Browse Source
This commit is contained in:
Bram Moolenaar
2008-01-04 15:31:21 +00:00
parent 383c6f5579
commit 690ffc0384
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fileio.c
View File

@@ -221,11 +221,12 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
{ {
int fd = 0; int fd = 0;
int newfile = (flags & READ_NEW); int newfile = (flags & READ_NEW);
int set_options = newfile || (eap != NULL && eap->read_edit);
int check_readonly; int check_readonly;
int filtering = (flags & READ_FILTER); int filtering = (flags & READ_FILTER);
int read_stdin = (flags & READ_STDIN); int read_stdin = (flags & READ_STDIN);
int read_buffer = (flags & READ_BUFFER); 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 */ 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 */ colnr_T read_buf_col = 0; /* next char to read from this line */
char_u c; char_u c;
@@ -649,9 +650,14 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
curbuf->b_p_ro = TRUE; curbuf->b_p_ro = TRUE;
if (set_options) if (set_options)
{
/* 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_p_eol = TRUE;
curbuf->b_start_eol = TRUE; curbuf->b_start_eol = TRUE;
}
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
curbuf->b_p_bomb = FALSE; curbuf->b_p_bomb = FALSE;
curbuf->b_start_bomb = FALSE; curbuf->b_start_bomb = FALSE;

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
201,
/**/ /**/
200, 200,
/**/ /**/