summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-02-20 10:29:39 +0000
committerBram Moolenaar <Bram@vim.org>2008-02-20 10:29:39 +0000
commit5360af919e2577a18053883d477d1af5a84e19f0 (patch)
treec7356f0213aa32083e70b7ebbf1fef2d5db657d1
parentc87841ca3df536fb9eedadeafc76db3a76a2068e (diff)
updated for version 7.1-255v7.1.255
-rw-r--r--src/mbyte.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index a7bf5c1c25..f881275404 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -360,6 +360,12 @@ enc_alias_table[] =
{"ucs4be", IDX_UCS4},
{"ucs-4be", IDX_UCS4},
{"ucs4le", IDX_UCS4LE},
+ {"utf32", IDX_UCS4},
+ {"utf-32", IDX_UCS4},
+ {"utf32be", IDX_UCS4},
+ {"utf-32be", IDX_UCS4},
+ {"utf32le", IDX_UCS4LE},
+ {"utf-32le", IDX_UCS4LE},
{"932", IDX_CP932},
{"949", IDX_CP949},
{"936", IDX_CP936},
diff --git a/src/version.c b/src/version.c
index 02e108e4f7..1c44e3eeab 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 */
/**/
+ 255,
+/**/
254,
/**/
253,