summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-07-24 20:09:16 +0000
committerBram Moolenaar <Bram@vim.org>2008-07-24 20:09:16 +0000
commitee0f5a60e063c7e2b5aa07dff1cf5bd15e9344e4 (patch)
tree7f292fb64ab973a0a393d2b5d7b76b64f89e5eb2
parent1387a60919113bd37e7d666b7f0e5f7eb3aa26a4 (diff)
updated for version 7.2b-021v7.2b.021
-rw-r--r--src/fileio.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index d68adec84e..ce5ee76e62 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5537,7 +5537,7 @@ check_for_bom(p, size, lenp, flags)
int len = 2;
if (p[0] == 0xef && p[1] == 0xbb && size >= 3 && p[2] == 0xbf
- && (flags == FIO_ALL || flags == 0))
+ && (flags == FIO_ALL || flags == FIO_UTF8 || flags == 0))
{
name = "utf-8"; /* EF BB BF */
len = 3;
diff --git a/src/version.c b/src/version.c
index 99b856566d..f6843cb0fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 21,
+/**/
20,
/**/
19,