diff options
author | Bram Moolenaar <Bram@vim.org> | 2007-07-24 07:51:18 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2007-07-24 07:51:18 +0000 |
commit | 9cffde9627bf54c1e32212685f3c03a62a132835 (patch) | |
tree | b6c4bd0354a36f9643507e7ded1107a17f55f283 | |
parent | 5f2c5dbd86d18835e094e465a769102d224f3d83 (diff) | |
download | vim-git-9cffde9627bf54c1e32212685f3c03a62a132835.tar.gz |
updated for version 7.1-033v7.1.033
-rw-r--r-- | src/option.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index b4beef1c8..51e6a34ea 100644 --- a/src/option.c +++ b/src/option.c @@ -10624,6 +10624,9 @@ save_file_ff(buf) file_ff_differs(buf) buf_T *buf; { + /* In a buffer that was never loaded the options are not valid. */ + if (buf->b_flags & BF_NEVERLOADED) + return FALSE; if ((buf->b_flags & BF_NEW) && buf->b_ml.ml_line_count == 1 && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL) diff --git a/src/version.c b/src/version.c index 082ce127f..98ecaf88b 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 33, +/**/ 32, /**/ 31, |