aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-195

Browse Source
This commit is contained in:
Bram Moolenaar 2007-02-13 05:19:30 +00:00
parent ad40f02cd9
commit 373154b00c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ex_cmds2.c
View File

@ -1242,14 +1242,22 @@ autowrite(buf, forceit)
buf_T *buf; buf_T *buf;
int forceit; int forceit;
{ {
int r;
if (!(p_aw || p_awa) || !p_write if (!(p_aw || p_awa) || !p_write
#ifdef FEAT_QUICKFIX #ifdef FEAT_QUICKFIX
/* never autowrite a "nofile" or "nowrite" buffer */ /* never autowrite a "nofile" or "nowrite" buffer */
|| bt_dontwrite(buf) || bt_dontwrite(buf)
#endif #endif
|| (!forceit && buf->b_p_ro) || buf->b_ffname == NULL) || (!forceit && buf->b_p_ro) || buf->b_ffname == NULL)
return FAIL; return FAIL;
return buf_write_all(buf, forceit); r = buf_write_all(buf, forceit);
/* Writing may succeed but the buffer still changed, e.g., when there is a
* conversion error. We do want to return FAIL then. */
if (buf_valid(buf) && bufIsChanged(buf))
r = FAIL;
return r;
} }
/* /*
@ -1472,6 +1480,8 @@ check_changed_any(hidden)
if (buf == NULL) /* No buffers changed */ if (buf == NULL) /* No buffers changed */
return FALSE; return FALSE;
/* Try auto-writing the buffer. If this fails but the buffer no
* longer exists it's not changed, that's OK. */
if (check_changed(buf, p_awa, TRUE, FALSE, TRUE) && buf_valid(buf)) if (check_changed(buf, p_awa, TRUE, FALSE, TRUE) && buf_valid(buf))
break; /* didn't save - still changes */ break; /* didn't save - still changes */
} }

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 */
/**/
195,
/**/ /**/
194, 194,
/**/ /**/